Browse Source

Update gradle to 3.1.

pull/138/head
Chris Smith 7 years ago
parent
commit
c305994178
5 changed files with 38 additions and 39 deletions
  1. 1
    1
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 2
    2
      gradle/wrapper/gradle-wrapper.properties
  4. 31
    26
      gradlew
  5. 4
    10
      gradlew.bat

+ 1
- 1
build.gradle View File

130
 }
130
 }
131
 
131
 
132
 task wrapper(type: Wrapper) {
132
 task wrapper(type: Wrapper) {
133
-    gradleVersion = '2.13'
133
+    gradleVersion = '3.1'
134
 }
134
 }
135
 
135
 
136
 def find(name) {
136
 def find(name) {

BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 2
- 2
gradle/wrapper/gradle-wrapper.properties View File

1
-#Thu May 05 16:42:15 BST 2016
1
+#Thu Oct 27 18:07:37 BST 2016
2
 distributionBase=GRADLE_USER_HOME
2
 distributionBase=GRADLE_USER_HOME
3
 distributionPath=wrapper/dists
3
 distributionPath=wrapper/dists
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

+ 31
- 26
gradlew View File

6
 ##
6
 ##
7
 ##############################################################################
7
 ##############################################################################
8
 
8
 
9
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10
-DEFAULT_JVM_OPTS=""
9
+# Attempt to set APP_HOME
10
+# Resolve links: $0 may be a link
11
+PRG="$0"
12
+# Need this for relative symlinks.
13
+while [ -h "$PRG" ] ; do
14
+    ls=`ls -ld "$PRG"`
15
+    link=`expr "$ls" : '.*-> \(.*\)$'`
16
+    if expr "$link" : '/.*' > /dev/null; then
17
+        PRG="$link"
18
+    else
19
+        PRG=`dirname "$PRG"`"/$link"
20
+    fi
21
+done
22
+SAVED="`pwd`"
23
+cd "`dirname \"$PRG\"`/" >/dev/null
24
+APP_HOME="`pwd -P`"
25
+cd "$SAVED" >/dev/null
11
 
26
 
12
 APP_NAME="Gradle"
27
 APP_NAME="Gradle"
13
 APP_BASE_NAME=`basename "$0"`
28
 APP_BASE_NAME=`basename "$0"`
14
 
29
 
30
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31
+DEFAULT_JVM_OPTS=""
32
+
15
 # Use the maximum available, or set MAX_FD != -1 to use that value.
33
 # Use the maximum available, or set MAX_FD != -1 to use that value.
16
 MAX_FD="maximum"
34
 MAX_FD="maximum"
17
 
35
 
30
 cygwin=false
48
 cygwin=false
31
 msys=false
49
 msys=false
32
 darwin=false
50
 darwin=false
51
+nonstop=false
33
 case "`uname`" in
52
 case "`uname`" in
34
   CYGWIN* )
53
   CYGWIN* )
35
     cygwin=true
54
     cygwin=true
40
   MINGW* )
59
   MINGW* )
41
     msys=true
60
     msys=true
42
     ;;
61
     ;;
62
+  NONSTOP* )
63
+    nonstop=true
64
+    ;;
43
 esac
65
 esac
44
 
66
 
45
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
46
-if $cygwin ; then
47
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48
-fi
49
-
50
-# Attempt to set APP_HOME
51
-# Resolve links: $0 may be a link
52
-PRG="$0"
53
-# Need this for relative symlinks.
54
-while [ -h "$PRG" ] ; do
55
-    ls=`ls -ld "$PRG"`
56
-    link=`expr "$ls" : '.*-> \(.*\)$'`
57
-    if expr "$link" : '/.*' > /dev/null; then
58
-        PRG="$link"
59
-    else
60
-        PRG=`dirname "$PRG"`"/$link"
61
-    fi
62
-done
63
-SAVED="`pwd`"
64
-cd "`dirname \"$PRG\"`/" >&-
65
-APP_HOME="`pwd -P`"
66
-cd "$SAVED" >&-
67
-
68
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
67
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
69
 
68
 
70
 # Determine the Java command to use to start the JVM.
69
 # Determine the Java command to use to start the JVM.
90
 fi
89
 fi
91
 
90
 
92
 # Increase the maximum file descriptors if we can.
91
 # Increase the maximum file descriptors if we can.
93
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
94
     MAX_FD_LIMIT=`ulimit -H -n`
93
     MAX_FD_LIMIT=`ulimit -H -n`
95
     if [ $? -eq 0 ] ; then
94
     if [ $? -eq 0 ] ; then
96
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
95
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
114
 if $cygwin ; then
113
 if $cygwin ; then
115
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
114
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
115
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116
+    JAVACMD=`cygpath --unix "$JAVACMD"`
117
 
117
 
118
     # We build the pattern for arguments to be converted via cygpath
118
     # We build the pattern for arguments to be converted via cygpath
119
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
119
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
161
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
161
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163
 
163
 
164
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
166
+  cd "$(dirname "$0")"
167
+fi
168
+
164
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
169
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

+ 4
- 10
gradlew.bat View File

8
 @rem Set local scope for the variables with windows NT shell
8
 @rem Set local scope for the variables with windows NT shell
9
 if "%OS%"=="Windows_NT" setlocal
9
 if "%OS%"=="Windows_NT" setlocal
10
 
10
 
11
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12
-set DEFAULT_JVM_OPTS=
13
-
14
 set DIRNAME=%~dp0
11
 set DIRNAME=%~dp0
15
 if "%DIRNAME%" == "" set DIRNAME=.
12
 if "%DIRNAME%" == "" set DIRNAME=.
16
 set APP_BASE_NAME=%~n0
13
 set APP_BASE_NAME=%~n0
17
 set APP_HOME=%DIRNAME%
14
 set APP_HOME=%DIRNAME%
18
 
15
 
16
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17
+set DEFAULT_JVM_OPTS=
18
+
19
 @rem Find java.exe
19
 @rem Find java.exe
20
 if defined JAVA_HOME goto findJavaFromJavaHome
20
 if defined JAVA_HOME goto findJavaFromJavaHome
21
 
21
 
46
 goto fail
46
 goto fail
47
 
47
 
48
 :init
48
 :init
49
-@rem Get command-line arguments, handling Windowz variants
49
+@rem Get command-line arguments, handling Windows variants
50
 
50
 
51
 if not "%OS%" == "Windows_NT" goto win9xME_args
51
 if not "%OS%" == "Windows_NT" goto win9xME_args
52
-if "%@eval[2+2]" == "4" goto 4NT_args
53
 
52
 
54
 :win9xME_args
53
 :win9xME_args
55
 @rem Slurp the command line arguments.
54
 @rem Slurp the command line arguments.
60
 if "x%~1" == "x" goto execute
59
 if "x%~1" == "x" goto execute
61
 
60
 
62
 set CMD_LINE_ARGS=%*
61
 set CMD_LINE_ARGS=%*
63
-goto execute
64
-
65
-:4NT_args
66
-@rem Get arguments from the 4NT Shell from JP Software
67
-set CMD_LINE_ARGS=%$
68
 
62
 
69
 :execute
63
 :execute
70
 @rem Setup the command line
64
 @rem Setup the command line

Loading…
Cancel
Save