Update to Gradle 8.2

gradlex-org · Jul 6, 2023 · 29ac1c8 · 29ac1c8
1 parent 568d987
commit 29ac1c8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
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,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

diff --git a/samples/configuration-cache/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts b/samples/configuration-cache/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts
@@ -13,5 +13,6 @@ tasks.test {
 dependencies {
     javaModuleDependencies {
         testRuntimeOnly(gav("org.junit.jupiter.engine"))
+        testRuntimeOnly(gav("org.junit.platform.launcher"))
     }
 }
diff --git a/samples/kotlin/build-logic/src/main/kotlin/org.my.gradle.kotlin-java-module.gradle.kts b/samples/kotlin/build-logic/src/main/kotlin/org.my.gradle.kotlin-java-module.gradle.kts
@@ -49,4 +49,5 @@ tasks.test {
 
 dependencies {
     testRuntimeOnly(javaModuleDependencies.gav("org.junit.jupiter.engine"))
+    testRuntimeOnly(javaModuleDependencies.gav("org.junit.platform.launcher"))
 }
diff --git a/samples/versions-in-catalog/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts b/samples/versions-in-catalog/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts
@@ -13,5 +13,6 @@ tasks.test {
 dependencies {
     javaModuleDependencies {
         testRuntimeOnly(gav("org.junit.jupiter.engine"))
+        testRuntimeOnly(gav("org.junit.platform.launcher"))
     }
 }
diff --git a/...les/versions-in-platform/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts b/...les/versions-in-platform/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts
@@ -14,6 +14,6 @@ dependencies {
     implementation(platform(project(":platform")))
     javaModuleDependencies {
         testRuntimeOnly(ga("org.junit.jupiter.engine"))
-        testRuntimeOnly(ga("org.junit.platform.launcher")) // https://github.com/junit-team/junit5/issues/2730#issuecomment-942145712
+        testRuntimeOnly(ga("org.junit.platform.launcher"))
     }
 }