Address @jdneo feedback and update Gradle to v8.4

microsoft · Oct 8, 2023 · d1c9668 · d1c9668
1 parent 3e69390
commit d1c9668
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -55,7 +55,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [16.14.2]
-        java-version: ["8", "11", "17", "19", "20", "21"]
+        java-version: ["8", "11", "17", "21"]
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2

diff --git a/gradle-server/src/main/java/com/github/badsyntax/gradle/utils/Utils.java b/gradle-server/src/main/java/com/github/badsyntax/gradle/utils/Utils.java
@@ -19,7 +19,8 @@ public static boolean hasCompatibilityError(Version gradleVersion, Version javaV
 	private static Version getLowestGradleVersion(Version javaVersion) {
 		// Ref: https://docs.gradle.org/current/userguide/compatibility.html
 		if (javaVersion.isAtLeast("21")) {
-			return new Version("8.4-rc-1");
+			// TODO: Update when support for running Gradle on Java 21 is available
+			return new Version("8.4");
 		} else if (javaVersion.isAtLeast("20")) {
 			return new Version("8.1");
 		} else if (javaVersion.isAtLeast("19")) {

diff --git a/gradle-server/src/test/java/com/github/badsyntax/gradle/UtilsTest.java b/gradle-server/src/test/java/com/github/badsyntax/gradle/UtilsTest.java
@@ -15,7 +15,7 @@ public class UtilsTest {
 	@Test
 	public void testJava21Compatibility() {
 		Version javaVersion = new Version("21");
-		Version gradleVersion = new Version("8.4-rc-1");
+		Version gradleVersion = new Version("8.4");
 		assertFalse(Utils.hasCompatibilityError(gradleVersion, javaVersion));
 		gradleVersion = new Version("8.1");
 		assertTrue(Utils.hasCompatibilityError(gradleVersion, javaVersion));

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME