Upgrade gradle version to 8.0.1 (#6656)

eddumelendez · web-flow · commit 8b5119b49b18 · 2023-02-20T17:58:29.000-06:00
* Update Gradle Wrapper from 7.6 to 8.0.1.
* Add foojay-toolchains plugin
* Remove test-support dependency
diff --git a/core/build.gradle b/core/build.gradle
@@ -104,7 +104,6 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionSha256Sum=948d1e4ccc2f6ae36cbfa087d827aaca51403acae5411e664a6000bb47946f22
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -35,4 +35,5 @@ compileTestJava {
     javaCompiler = javaToolchains.compilerFor {
         languageVersion = JavaLanguageVersion.of(11)
     }
+    options.release.set(11)
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -1,6 +1,5 @@
 dependencies {
     api project(':jdbc')
-    api project(':test-support')
 
     api 'com.google.guava:guava:31.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -2,7 +2,6 @@ description = "Testcontainers :: JDBC"
 
 dependencies {
     api project(':database-commons')
-    testImplementation project(':test-support')
 
     compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation project(':test-support')
     testImplementation 'org.postgresql:postgresql:42.5.3'
 
     testImplementation testFixtures(project(':r2dbc'))
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
@@ -6,6 +6,4 @@ dependencies {
 
     testImplementation 'redis.clients:jedis:3.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-
-    testImplementation project(':test-support')
 }
diff --git a/settings.gradle b/settings.gradle
@@ -7,11 +7,13 @@ buildscript {
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
+        classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }
 
 apply plugin: 'com.gradle.enterprise'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
+apply plugin: "org.gradle.toolchains.foojay-resolver-convention"
 
 rootProject.name = 'testcontainers-java'
 

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ compileTestJava {`
`35`	`35`	`javaCompiler = javaToolchains.compilerFor {`
`36`	`36`	`languageVersion = JavaLanguageVersion.of(11)`
`37`	`37`	`}`
	`38`	`+ options.release.set(11)`
`38`	`39`	`}`