Browse Source

Update gradle to 3.1.

pull/109/head
Chris Smith 7 years ago
parent
commit
0110df4ced
4 changed files with 8 additions and 9 deletions
  1. 1
    1
      build.gradle
  2. 2
    2
      gradle/wrapper/gradle-wrapper.properties
  3. 5
    0
      gradlew
  4. 0
    6
      gradlew.bat

+ 1
- 1
build.gradle View File

12
 
12
 
13
 task wrapper(type: Wrapper) {
13
 task wrapper(type: Wrapper) {
14
     description 'Downloads and installs an up-to-date wrapper for gradle.'
14
     description 'Downloads and installs an up-to-date wrapper for gradle.'
15
-    gradleVersion = '2.14'
15
+    gradleVersion = '3.1'
16
 }
16
 }
17
 
17
 

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

1
-#Mon Jul 04 18:46:31 BST 2016
1
+#Thu Oct 27 18:01:10 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.14-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

+ 5
- 0
gradlew View File

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 "$@"

+ 0
- 6
gradlew.bat View File

49
 @rem Get command-line arguments, handling Windows 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