diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec76118f2..d65f82928 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: fail-fast: false matrix: node-version: [16.14.2] - java-version: ["8", "11", "17", "19"] + java-version: ["8", "11", "17", "21"] os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 83470f2b5..2f3ca2fde 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This VS Code extension provides a visual interface for your Gradle build. You ca ## Requirements - [VS Code >= 1.76.0](https://code.visualstudio.com/download) -- [Java from 8 to 19](https://adoptium.net/) +- [Java from 8 to 21](https://adoptium.net/) ## Project Discovery diff --git a/build.gradle b/build.gradle index 9abefbc62..d492b25ab 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'com.google.protobuf' version '0.8.13' id 'com.github.jlouns.cpe' version '0.5.0' - id 'com.diffplug.spotless' version '6.7.2' + alias(libs.plugins.spotless) } project.ext.set('grpcVersion', '1.53.0') diff --git a/extension/src/util/config.ts b/extension/src/util/config.ts index 609fd8e88..68d5a31aa 100644 --- a/extension/src/util/config.ts +++ b/extension/src/util/config.ts @@ -36,7 +36,7 @@ export async function getSupportedJavaHome(): Promise { const runtime = await getRuntime(javaHome, { withVersion: true }); if (runtime?.version) { // check the JDK version of given java home is supported, otherwise return undefined - return runtime.version.major >= 8 && runtime.version.major <= 19 ? javaHome : undefined; + return runtime.version.major >= 8 && runtime.version.major <= 21 ? javaHome : undefined; } } return undefined; diff --git a/extension/test-fixtures/gradle-groovy-custom-build-file/gradle/wrapper/gradle-wrapper.properties b/extension/test-fixtures/gradle-groovy-custom-build-file/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..e411586a5 100644 --- a/extension/test-fixtures/gradle-groovy-custom-build-file/gradle/wrapper/gradle-wrapper.properties +++ b/extension/test-fixtures/gradle-groovy-custom-build-file/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/extension/test-fixtures/gradle-groovy-default-build-file/gradle/wrapper/gradle-wrapper.properties b/extension/test-fixtures/gradle-groovy-default-build-file/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..e411586a5 100644 --- a/extension/test-fixtures/gradle-groovy-default-build-file/gradle/wrapper/gradle-wrapper.properties +++ b/extension/test-fixtures/gradle-groovy-default-build-file/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/extension/test-fixtures/gradle-kotlin-default-build-file/gradle/wrapper/gradle-wrapper.properties b/extension/test-fixtures/gradle-kotlin-default-build-file/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..e411586a5 100644 --- a/extension/test-fixtures/gradle-kotlin-default-build-file/gradle/wrapper/gradle-wrapper.properties +++ b/extension/test-fixtures/gradle-kotlin-default-build-file/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/extension/test-fixtures/multi-project/gradle/wrapper/gradle-wrapper.properties b/extension/test-fixtures/multi-project/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..e411586a5 100644 --- a/extension/test-fixtures/multi-project/gradle/wrapper/gradle-wrapper.properties +++ b/extension/test-fixtures/multi-project/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle-language-server/build.gradle b/gradle-language-server/build.gradle index 7e6f85697..7bd028264 100644 --- a/gradle-language-server/build.gradle +++ b/gradle-language-server/build.gradle @@ -23,7 +23,7 @@ application { dependencies { implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:0.12.0" implementation "org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.12.0" - implementation "org.codehaus.groovy:groovy-eclipse-batch:4.0.9-02" + implementation "org.codehaus.groovy:groovy-eclipse-batch:4.0.15-03" implementation "com.google.code.gson:gson:2.8.9" implementation "org.apache.bcel:bcel:6.6.1" testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1" 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 index ae3aee054..c569ea23d 100644 --- 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 @@ -18,7 +18,12 @@ 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("19")) { + if (javaVersion.isAtLeast("21")) { + // 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")) { return new Version("7.6"); } else if (javaVersion.isAtLeast("18")) { return new Version("7.5"); 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 index ef1a6efc8..f7fd9c6b7 100644 --- a/gradle-server/src/test/java/com/github/badsyntax/gradle/UtilsTest.java +++ b/gradle-server/src/test/java/com/github/badsyntax/gradle/UtilsTest.java @@ -12,6 +12,24 @@ public class UtilsTest { + @Test + public void testJava21Compatibility() { + Version javaVersion = new Version("21"); + Version gradleVersion = new Version("8.4"); + assertFalse(Utils.hasCompatibilityError(gradleVersion, javaVersion)); + gradleVersion = new Version("8.1"); + assertTrue(Utils.hasCompatibilityError(gradleVersion, javaVersion)); + } + + @Test + public void testJava20Compatibility() { + Version javaVersion = new Version("20.0.2"); + Version gradleVersion = new Version("8.1"); + assertFalse(Utils.hasCompatibilityError(gradleVersion, javaVersion)); + gradleVersion = new Version("8.0.1"); + assertTrue(Utils.hasCompatibilityError(gradleVersion, javaVersion)); + } + @Test public void testJava19Compatibility() { Version javaVersion = new Version("19.0.1"); diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..7f93135c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..3fa8f862f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefaa5..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ 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. 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=SC2039,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=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..93e3f59f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. 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 :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 7e570b28b..79f1110fa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,13 @@ rootProject.name = 'vscode-gradle' + +dependencyResolutionManagement { + versionCatalogs { + libs { + plugin('spotless', 'com.diffplug.spotless').version(JavaVersion.current().isJava8() ? '6.13.0' : '6.22.0') + } + } +} + include('gradle-server') include('extension') include('npm-package')