Skip to content

Commit 3ea4abc

Browse files
committed
Address @jdneo feedback and update Gradle to v8.4
1 parent 5647c5a commit 3ea4abc

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
fail-fast: false
6262
matrix:
6363
node-version: [16.14.2]
64-
java-version: ["8", "11", "17", "19", "20", "21"]
64+
java-version: ["8", "11", "17", "21"]
6565
os: [ubuntu-latest, windows-latest, macos-latest]
6666
steps:
6767
- uses: actions/checkout@v2

gradle-server/src/main/java/com/github/badsyntax/gradle/utils/Utils.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public static boolean hasCompatibilityError(Version gradleVersion, Version javaV
1919
private static Version getLowestGradleVersion(Version javaVersion) {
2020
// Ref: https://docs.gradle.org/current/userguide/compatibility.html
2121
if (javaVersion.isAtLeast("21")) {
22-
return new Version("8.4-rc-1");
22+
// TODO: Update when support for running Gradle on Java 21 is available
23+
return new Version("8.4");
2324
} else if (javaVersion.isAtLeast("20")) {
2425
return new Version("8.1");
2526
} else if (javaVersion.isAtLeast("19")) {

gradle-server/src/test/java/com/github/badsyntax/gradle/UtilsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class UtilsTest {
1515
@Test
1616
public void testJava21Compatibility() {
1717
Version javaVersion = new Version("21");
18-
Version gradleVersion = new Version("8.4-rc-1");
18+
Version gradleVersion = new Version("8.4");
1919
assertFalse(Utils.hasCompatibilityError(gradleVersion, javaVersion));
2020
gradleVersion = new Version("8.1");
2121
assertTrue(Utils.hasCompatibilityError(gradleVersion, javaVersion));

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)