Upgrade to Gradle 7.0 (#1712)

* Convert to gradle 7.

* More fixes, regenerated lockfiles.

* Update lockfiles for dependency update.

* Fix show_upgrade_diff for new lockfile format

* Add property for allowInsecureProtocol

Allow us to override the restriction against use of plain HTTP for
communication to dependency repositories.  We need this to be able to use a
local proxy for dependency gathering.

* Checking in missing gradle.lockfile
This commit is contained in:
Michael Muller 2022-07-26 11:41:27 -04:00 committed by GitHub
parent 68f975451e
commit 06ca9266b4
349 changed files with 3999 additions and 26646 deletions

View file

@ -41,22 +41,22 @@ def testUberJarName = ''
dependencies {
gradleLint.ignore('unused-dependency') {
if (schema_version == USE_LOCAL) {
testRuntime project(path: ':db', configuration: 'schema')
testRuntimeOnly project(path: ':db', configuration: 'schema')
} else {
testRuntime "google.registry:schema:${schema_version}"
testRuntimeOnly "google.registry:schema:${schema_version}"
}
if (nomulus_version == USE_LOCAL) {
testRuntime project(path: ':core', configuration: 'nomulus_test')
testRuntimeOnly project(path: ':core', configuration: 'nomulus_test')
testUberJarName = 'nomulus-tests-alldeps.jar'
} else {
testRuntime "google.registry:nomulus_test:${nomulus_version}:public"
testRuntime "google.registry:nomulus_test:${nomulus_version}:alldeps"
testRuntimeOnly "google.registry:nomulus_test:${nomulus_version}:public"
testRuntimeOnly "google.registry:nomulus_test:${nomulus_version}:alldeps"
testUberJarName = "nomulus_test-${nomulus_version}-alldeps.jar"
}
}
}
configurations.testRuntime.transitive = false
configurations.testRuntimeOnly.transitive = false
def unpackedTestDir = "${projectDir}/build/unpackedTests/${nomulus_version}"
@ -69,7 +69,7 @@ task extractSqlIntegrationTestSuite (type: Copy) {
}
outputs.dir unpackedTestDir
from zipTree(
configurations.testRuntime
configurations.testRuntimeClasspath
.filter { it.name == testUberJarName}
.singleFile).matching {
include 'google/registry/**/SqlIntegrationTestSuite.class'
@ -83,7 +83,7 @@ task sqlIntegrationTest(type: Test) {
// Explicitly choose JUnit 4 for test suites. See :core:sqlIntegrationTest for details.
useJUnit()
testClassesDirs = files(unpackedTestDir)
classpath = configurations.testRuntime
classpath = configurations.testRuntimeClasspath
include 'google/registry/schema/integration/SqlIntegrationTestSuite.*'
dependsOn extractSqlIntegrationTestSuite

View file

@ -1,3 +1,4 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
empty=classpath