From 98d7405639090de589b2e4cb1968f4f849d619ae Mon Sep 17 00:00:00 2001 From: ghubstan <36207203+ghubstan@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:27:18 -0300 Subject: [PATCH] Upgrade gradle wrappers --- java-examples/gradle/README.md | 27 +++++++++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 4 +-- java-examples/gradlew | 6 +++++ java-examples/gradlew.bat | 14 +++++----- reference-doc-builder/gradle/README.md | 27 +++++++++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 4 +-- reference-doc-builder/gradlew | 6 +++++ reference-doc-builder/gradlew.bat | 14 +++++----- 8 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 java-examples/gradle/README.md create mode 100644 reference-doc-builder/gradle/README.md diff --git a/java-examples/gradle/README.md b/java-examples/gradle/README.md new file mode 100644 index 0000000..765aa05 --- /dev/null +++ b/java-examples/gradle/README.md @@ -0,0 +1,27 @@ +# How to upgrade the Gradle version + +Visit the [Gradle website](https://gradle.org/releases) and decide the: + + - desired version + - desired distribution type + - what is the sha256 for the version and type chosen above + +Adjust the following command with tha arguments above and execute it twice: + +```asciidoc +$ ./gradlew wrapper --gradle-version 7.5 \ + --distribution-type bin \ + --gradle-distribution-sha256-sum cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 +``` + +The first execution should automatically update: + +- `java-examples/gradle/wrapper/gradle-wrapper.properties` + +The second execution should then update: + +- `java-examples/gradle/wrapper/gradle-wrapper.jar` +- `java-examples/gradlew` +- `java-examples/gradlew.bat` + +The four updated files are ready to be committed. diff --git a/java-examples/gradle/wrapper/gradle-wrapper.properties b/java-examples/gradle/wrapper/gradle-wrapper.properties index 5925064..012d6d9 100644 --- a/java-examples/gradle/wrapper/gradle-wrapper.properties +++ b/java-examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java-examples/gradlew b/java-examples/gradlew index 1b6c787..a69d9cb 100755 --- a/java-examples/gradlew +++ b/java-examples/gradlew @@ -205,6 +205,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/java-examples/gradlew.bat b/java-examples/gradlew.bat index ac1b06f..53a6b23 100644 --- a/java-examples/gradlew.bat +++ b/java-examples/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,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,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 +75,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/reference-doc-builder/gradle/README.md b/reference-doc-builder/gradle/README.md new file mode 100644 index 0000000..c051020 --- /dev/null +++ b/reference-doc-builder/gradle/README.md @@ -0,0 +1,27 @@ +# How to upgrade the Gradle version + +Visit the [Gradle website](https://gradle.org/releases) and decide the: + + - desired version + - desired distribution type + - what is the sha256 for the version and type chosen above + +Adjust the following command with tha arguments above and execute it twice: + +```asciidoc +$ ./gradlew wrapper --gradle-version 7.5 \ + --distribution-type bin \ + --gradle-distribution-sha256-sum cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 +``` + +The first execution should automatically update: + +- `reference-doc-builder/gradle/wrapper/gradle-wrapper.properties` + +The second execution should then update: + +- `reference-doc-builder/gradle/wrapper/gradle-wrapper.jar` +- `reference-doc-builder/gradlew` +- `reference-doc-builder/gradlew.bat` + +The four updated files are ready to be committed. diff --git a/reference-doc-builder/gradle/wrapper/gradle-wrapper.properties b/reference-doc-builder/gradle/wrapper/gradle-wrapper.properties index 5925064..012d6d9 100644 --- a/reference-doc-builder/gradle/wrapper/gradle-wrapper.properties +++ b/reference-doc-builder/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/reference-doc-builder/gradlew b/reference-doc-builder/gradlew index 1b6c787..a69d9cb 100755 --- a/reference-doc-builder/gradlew +++ b/reference-doc-builder/gradlew @@ -205,6 +205,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/reference-doc-builder/gradlew.bat b/reference-doc-builder/gradlew.bat index ac1b06f..53a6b23 100644 --- a/reference-doc-builder/gradlew.bat +++ b/reference-doc-builder/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,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,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 +75,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