Upgrade to Gradle 7.5

Closes gh-1322
This commit is contained in:
Stephane Nicoll
2022-07-20 15:36:27 +02:00
parent fe5e1b5b4b
commit 4533984a3e
6 changed files with 17 additions and 9 deletions
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
@@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ 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. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 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 :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
@@ -85,7 +85,7 @@ class GradleKtsProjectGenerationConfigurationTests {
} }
static Stream<Arguments> gradleWrapperParameters() { static Stream<Arguments> gradleWrapperParameters() {
return Stream.of(Arguments.arguments("2.2.3.RELEASE", "6.9.2"), Arguments.arguments("2.5.0", "7.4.1")); return Stream.of(Arguments.arguments("2.2.3.RELEASE", "6.9.2"), Arguments.arguments("2.5.0", "7.5"));
} }
@ParameterizedTest(name = "Spring Boot {0}") @ParameterizedTest(name = "Spring Boot {0}")
@@ -83,7 +83,7 @@ class GradleProjectGenerationConfigurationTests {
} }
static Stream<Arguments> gradleWrapperParameters() { static Stream<Arguments> gradleWrapperParameters() {
return Stream.of(Arguments.arguments("2.2.3.RELEASE", "6.9.2"), Arguments.arguments("2.5.0", "7.4.1")); return Stream.of(Arguments.arguments("2.2.3.RELEASE", "6.9.2"), Arguments.arguments("2.5.0", "7.5"));
} }
@ParameterizedTest(name = "Spring Boot {0}") @ParameterizedTest(name = "Spring Boot {0}")