aboutsummaryrefslogtreecommitdiff
path: root/gradlew.bat
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2020-08-11 14:03:30 +0530
committerGitHub <noreply@github.com>2020-08-11 10:33:30 +0200
commit8f957ca99454efe1711e2424620d2632bed6cb63 (patch)
treebf49a0dc2c797257f7a8c1590a299a26b01a2a8c /gradlew.bat
parent5715b59ed424a8aee963aa7f4857bba118d20ede (diff)
Uprev Gradle and dependencies (#1007)
* build: uprev Gradle Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * build: uprev dependencies Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * app/proguard: remove Tink rules I'm assuming the R8 problems fixed by the Tink upgrade cover this as well Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'gradlew.bat')
-rw-r--r--gradlew.bat21
1 files changed, 3 insertions, 18 deletions
diff --git a/gradlew.bat b/gradlew.bat
index a9f778a7..ac1b06f9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -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 init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell