Skip to content

Commit 1a8013d

Browse files
authored
build: Bump Gradle Wrapper to v8.4 (#1419)
* Update Gradle to v8.4 * Use Version Catalogs to dynamically choose Spotless plugin version
1 parent 9b858af commit 1a8013d

File tree

16 files changed

+87
-35
lines changed

16 files changed

+87
-35
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"]
64+
java-version: ["8", "11", "17", "21"]
6565
os: [ubuntu-latest, windows-latest, macos-latest]
6666
steps:
6767
- uses: actions/checkout@v2

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This VS Code extension provides a visual interface for your Gradle build. You ca
99
## Requirements
1010

1111
- [VS Code >= 1.76.0](https://code.visualstudio.com/download)
12-
- [Java from 8 to 19](https://adoptium.net/)
12+
- [Java from 8 to 21](https://adoptium.net/)
1313

1414
## Project Discovery
1515

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'java'
33
id 'com.google.protobuf' version '0.8.13'
44
id 'com.github.jlouns.cpe' version '0.5.0'
5-
id 'com.diffplug.spotless' version '6.7.2'
5+
alias(libs.plugins.spotless)
66
}
77

88
project.ext.set('grpcVersion', '1.53.0')

extension/src/util/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export async function getSupportedJavaHome(): Promise<string | undefined> {
3636
const runtime = await getRuntime(javaHome, { withVersion: true });
3737
if (runtime?.version) {
3838
// check the JDK version of given java home is supported, otherwise return undefined
39-
return runtime.version.major >= 8 && runtime.version.major <= 19 ? javaHome : undefined;
39+
return runtime.version.major >= 8 && runtime.version.major <= 21 ? javaHome : undefined;
4040
}
4141
}
4242
return undefined;
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradle-language-server/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ application {
2323
dependencies {
2424
implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:0.12.0"
2525
implementation "org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.12.0"
26-
implementation "org.codehaus.groovy:groovy-eclipse-batch:4.0.9-02"
26+
implementation "org.codehaus.groovy:groovy-eclipse-batch:4.0.15-03"
2727
implementation "com.google.code.gson:gson:2.8.9"
2828
implementation "org.apache.bcel:bcel:6.6.1"
2929
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ public static boolean hasCompatibilityError(Version gradleVersion, Version javaV
1818

1919
private static Version getLowestGradleVersion(Version javaVersion) {
2020
// Ref: https://docs.gradle.org/current/userguide/compatibility.html
21-
if (javaVersion.isAtLeast("19")) {
21+
if (javaVersion.isAtLeast("21")) {
22+
// TODO: Update when support for running Gradle on Java 21 is available
23+
return new Version("8.4");
24+
} else if (javaVersion.isAtLeast("20")) {
25+
return new Version("8.1");
26+
} else if (javaVersion.isAtLeast("19")) {
2227
return new Version("7.6");
2328
} else if (javaVersion.isAtLeast("18")) {
2429
return new Version("7.5");

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

+18
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,24 @@
1212

1313
public class UtilsTest {
1414

15+
@Test
16+
public void testJava21Compatibility() {
17+
Version javaVersion = new Version("21");
18+
Version gradleVersion = new Version("8.4");
19+
assertFalse(Utils.hasCompatibilityError(gradleVersion, javaVersion));
20+
gradleVersion = new Version("8.1");
21+
assertTrue(Utils.hasCompatibilityError(gradleVersion, javaVersion));
22+
}
23+
24+
@Test
25+
public void testJava20Compatibility() {
26+
Version javaVersion = new Version("20.0.2");
27+
Version gradleVersion = new Version("8.1");
28+
assertFalse(Utils.hasCompatibilityError(gradleVersion, javaVersion));
29+
gradleVersion = new Version("8.0.1");
30+
assertTrue(Utils.hasCompatibilityError(gradleVersion, javaVersion));
31+
}
32+
1533
@Test
1634
public void testJava19Compatibility() {
1735
Version javaVersion = new Version("19.0.1");

gradle/wrapper/gradle-wrapper.jar

4.09 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

+33-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
3232
# Busybox and similar reduced shells will NOT work, because this script
3333
# requires all of these POSIX shell features:
3434
# * functions;
35-
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36-
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37-
# * compound commands having a testable exit status, especially «case»;
38-
# * various built-in commands including «command», «set», and «ulimit».
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
3939
#
4040
# Important for patching:
4141
#
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
201210

202211
set -- \
203212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204213
-classpath "$CLASSPATH" \
205214
org.gradle.wrapper.GradleWrapperMain \
206215
"$@"
207216

217+
# Stop when "xargs" is not available.
218+
if ! command -v xargs >/dev/null 2>&1
219+
then
220+
die "xargs is not available"
221+
fi
222+
208223
# Use "xargs" to parse quoted args.
209224
#
210225
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

settings.gradle

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
rootProject.name = 'vscode-gradle'
2+
3+
dependencyResolutionManagement {
4+
versionCatalogs {
5+
libs {
6+
plugin('spotless', 'com.diffplug.spotless').version(JavaVersion.current().isJava8() ? '6.13.0' : '6.22.0')
7+
}
8+
}
9+
}
10+
211
include('gradle-server')
312
include('extension')
413
include('npm-package')

0 commit comments

Comments
 (0)