diff --git a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.jar and b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 19acfb4..2c3425d 100644 --- a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/.github/workflow-samples/gradle-plugin/gradlew b/.github/workflow-samples/gradle-plugin/gradlew index 79a61d4..aeb74cb 100755 --- a/.github/workflow-samples/gradle-plugin/gradlew +++ b/.github/workflow-samples/gradle-plugin/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar and b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar differ diff --git a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties index 19acfb4..2c3425d 100644 --- a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/.github/workflow-samples/groovy-dsl/gradlew b/.github/workflow-samples/groovy-dsl/gradlew index 79a61d4..aeb74cb 100755 --- a/.github/workflow-samples/groovy-dsl/gradlew +++ b/.github/workflow-samples/groovy-dsl/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index ce2d92d..3b95bf2 100644 --- a/.github/workflow-samples/groovy-dsl/settings.gradle +++ b/.github/workflow-samples/groovy-dsl/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.6" + id "com.gradle.enterprise" version "3.13" id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10" } diff --git a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.jar b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.jar and b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.jar differ diff --git a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties index 19acfb4..2c3425d 100644 --- a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/.github/workflow-samples/java-toolchain/gradlew b/.github/workflow-samples/java-toolchain/gradlew index 79a61d4..aeb74cb 100755 --- a/.github/workflow-samples/java-toolchain/gradlew +++ b/.github/workflow-samples/java-toolchain/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar and b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar differ diff --git a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties index 19acfb4..2c3425d 100644 --- a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/.github/workflow-samples/kotlin-dsl/gradlew b/.github/workflow-samples/kotlin-dsl/gradlew index 79a61d4..aeb74cb 100755 --- a/.github/workflow-samples/kotlin-dsl/gradlew +++ b/.github/workflow-samples/kotlin-dsl/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index 55dc7ab..7649d1b 100644 --- a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts +++ b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.gradle.enterprise") version "3.12.6" + id("com.gradle.enterprise") version "3.13" id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10" } diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index b404213..e44293e 100644 --- a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle +++ b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.build-scan" version "3.12.6" + id "com.gradle.build-scan" version "3.13" } gradleEnterprise { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index dad5f1e..0deb627 100644 --- a/.github/workflow-samples/no-wrapper/settings.gradle +++ b/.github/workflow-samples/no-wrapper/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.6" + id "com.gradle.enterprise" version "3.13" } gradleEnterprise { diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml index 045048b..373c691 100644 --- a/.github/workflows/ci-quick-check.yml +++ b/.github/workflows/ci-quick-check.yml @@ -22,7 +22,7 @@ jobs: - name: Configure Gradle as default for unit test uses: ./ with: - gradle-version: 7.6.1 + gradle-version: 8.1.1 - name: Run tests run: | npm install diff --git a/.tool-versions b/.tool-versions index edd7724..07512b8 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ # Configuration file for asdf version manager nodejs 16.18.1 -gradle 7.6.1 +gradle 8.1.1 diff --git a/test/init-scripts/gradle/wrapper/gradle-wrapper.jar b/test/init-scripts/gradle/wrapper/gradle-wrapper.jar index 41d9927..c1962a7 100644 Binary files a/test/init-scripts/gradle/wrapper/gradle-wrapper.jar and b/test/init-scripts/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test/init-scripts/gradle/wrapper/gradle-wrapper.properties b/test/init-scripts/gradle/wrapper/gradle-wrapper.properties index ae04661..2c3425d 100644 --- a/test/init-scripts/gradle/wrapper/gradle-wrapper.properties +++ b/test/init-scripts/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test/init-scripts/gradlew b/test/init-scripts/gradlew index 1b6c787..aeb74cb 100755 --- a/test/init-scripts/gradlew +++ b/test/init-scripts/gradlew @@ -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,10 @@ 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi 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=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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,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/test/init-scripts/gradlew.bat b/test/init-scripts/gradlew.bat index 107acd3..93e3f59 100644 --- a/test/init-scripts/gradlew.bat +++ b/test/init-scripts/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/test/init-scripts/settings.gradle b/test/init-scripts/settings.gradle index 0cdaecf..10500d8 100644 --- a/test/init-scripts/settings.gradle +++ b/test/init-scripts/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.6" + id "com.gradle.enterprise" version "3.13" id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10" } diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy index 61b7c2c..427b557 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy @@ -134,7 +134,7 @@ class BaseInitScriptTest extends Specification { } else { """ plugins { - id 'com.gradle.enterprise' version '3.12.6' + id 'com.gradle.enterprise' version '3.13' } gradleEnterprise { server = '$mockScansServer.address' @@ -160,7 +160,7 @@ class BaseInitScriptTest extends Specification { } else if (gradleVersion < GradleVersion.version('6.0')) { """ plugins { - id 'com.gradle.build-scan' version '3.12.6' + id 'com.gradle.build-scan' version '3.13' } gradleEnterprise { server = '$mockScansServer.address' diff --git a/test/jest/cache-cleanup.test.ts b/test/jest/cache-cleanup.test.ts index f491608..2f1aba9 100644 --- a/test/jest/cache-cleanup.test.ts +++ b/test/jest/cache-cleanup.test.ts @@ -47,18 +47,18 @@ test('will cleanup unused gradle versions', async () => { // Run with only one of these versions await runGradleBuild(projectRoot, 'build') - const gradle733 = path.resolve(gradleUserHome, "caches/7.3.3") - const wrapper733 = path.resolve(gradleUserHome, "wrapper/dists/gradle-7.3.3-bin") - const gradleCurrent = path.resolve(gradleUserHome, "caches/7.6.1") + const gradle802 = path.resolve(gradleUserHome, "caches/8.0.2") + const wrapper802 = path.resolve(gradleUserHome, "wrapper/dists/gradle-8.0.2-bin") + const gradleCurrent = path.resolve(gradleUserHome, "caches/8.1.1") - expect(fs.existsSync(gradle733)).toBe(true) - expect(fs.existsSync(wrapper733)).toBe(true) + expect(fs.existsSync(gradle802)).toBe(true) + expect(fs.existsSync(wrapper802)).toBe(true) expect(fs.existsSync(gradleCurrent)).toBe(true) await cacheCleaner.forceCleanup() - expect(fs.existsSync(gradle733)).toBe(false) - expect(fs.existsSync(wrapper733)).toBe(false) + expect(fs.existsSync(gradle802)).toBe(false) + expect(fs.existsSync(wrapper802)).toBe(false) expect(fs.existsSync(gradleCurrent)).toBe(true) }) diff --git a/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar b/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar index 41d9927..ccebba7 100644 Binary files a/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar and b/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties b/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties index 1598459..dbcaa3b 100644 --- a/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties +++ b/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists # Deliberately not using the latest Gradle version for cache cleanup testing -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists - \ No newline at end of file diff --git a/test/jest/resources/cache-cleanup/gradlew b/test/jest/resources/cache-cleanup/gradlew index 1b6c787..aeb74cb 100755 --- a/test/jest/resources/cache-cleanup/gradlew +++ b/test/jest/resources/cache-cleanup/gradlew @@ -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,10 @@ 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi 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=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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,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/test/jest/resources/cache-cleanup/gradlew.bat b/test/jest/resources/cache-cleanup/gradlew.bat index 107acd3..93e3f59 100644 --- a/test/jest/resources/cache-cleanup/gradlew.bat +++ b/test/jest/resources/cache-cleanup/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