From 693457ea92344e93f5a0aa6be907a417bffc9000 Mon Sep 17 00:00:00 2001 From: Jie Lin Date: Fri, 16 May 2025 15:37:52 -0700 Subject: [PATCH] Upgrade gradle version --- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 53556 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 46 +++++++++++------------ gradlew.bat | 8 ++-- 5 files changed, 29 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 930736e7..182c81ac 100644 --- a/build.gradle +++ b/build.gradle @@ -30,11 +30,11 @@ dependencies { compile 'com.squareup.okio:okio:3.6.0' compile 'commons-codec:commons-codec:1.15' } - +/* task wrapper(type: Wrapper) { gradleVersion = '3.1' } - +*/ buildscript { repositories { jcenter() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ca78035ef0501d802d4fc55381ef2d5c3ce0ec6e..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 3775 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 delta 3724 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 WlHeQU8?us>4jg)nMaXqL-G2b7HEzWK diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f078f3c5..0942cba6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 21 13:08:48 CST 2016 +#Wed Oct 14 10:29:10 IST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/gradlew b/gradlew index 27309d92..9d82f789 100755 --- a/gradlew +++ b/gradlew @@ -6,30 +6,12 @@ ## ############################################################################## -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$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="" - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -48,7 +30,6 @@ die ( ) { cygwin=false msys=false darwin=false -nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -59,11 +40,26 @@ case "`uname`" in MINGW* ) msys=true ;; - NONSTOP* ) - nonstop=true - ;; esac +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -89,7 +85,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then diff --git a/gradlew.bat b/gradlew.bat index f6d5974e..aec99730 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args