Skip to content

Commit 8f94793

Browse files
committed
Revert "Build: Update gradle wrapper to 6.9.1"
This reverts commit a7668fa.
1 parent 7ebe71c commit 8f94793

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,9 @@ apply from: 'gradle/javadoc.gradle'
361361
//////////////////////////////////////////
362362
// Root project configuration //
363363
//////////////////////////////////////////
364+
wrapper {
365+
gradleVersion = '6.0.1'
366+
}
364367

365368
if (!JavaVersion.current().isJava9Compatible()) {
366369
throw new GradleException("""

gradle/wrapper/gradle-wrapper.jar

-501 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
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-6.9.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85-
8685
# Determine the Java command to use to start the JVM.
8786
if [ -n "$JAVA_HOME" ] ; then
8887
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -130,7 +129,6 @@ fi
130129
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
134132
JAVACMD=`cygpath --unix "$JAVACMD"`
135133

136134
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34-
3532
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3633
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3734

@@ -40,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4037

4138
set JAVA_EXE=java.exe
4239
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
40+
if "%ERRORLEVEL%" == "0" goto init
4441

4542
echo.
4643
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +51,7 @@ goto fail
5451
set JAVA_HOME=%JAVA_HOME:"=%
5552
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5653

57-
if exist "%JAVA_EXE%" goto execute
54+
if exist "%JAVA_EXE%" goto init
5855

5956
echo.
6057
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +61,28 @@ echo location of your Java installation.
6461

6562
goto fail
6663

64+
:init
65+
@rem Get command-line arguments, handling Windows variants
66+
67+
if not "%OS%" == "Windows_NT" goto win9xME_args
68+
69+
:win9xME_args
70+
@rem Slurp the command line arguments.
71+
set CMD_LINE_ARGS=
72+
set _SKIP=2
73+
74+
:win9xME_args_slurp
75+
if "x%~1" == "x" goto execute
76+
77+
set CMD_LINE_ARGS=%*
78+
6779
:execute
6880
@rem Setup the command line
6981

7082
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7183

72-
7384
@rem Execute Gradle
74-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
85+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
7586

7687
:end
7788
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)