Browse Source

Merge pull request #107 from csmith/master

Update gradle.
pull/108/head
Greg Holmes 7 years ago
parent
commit
d3c27fd470
5 changed files with 32 additions and 28 deletions
  1. 2
    2
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 2
    2
      gradle/wrapper/gradle-wrapper.properties
  4. 25
    21
      gradlew
  5. 3
    3
      gradlew.bat

+ 2
- 2
build.gradle View File

@@ -10,8 +10,8 @@ apply from: 'gradle/resolve-dependencies.gradle'
10 10
 subprojects.each { evaluationDependsOn it.path }
11 11
 tasks.dependencies.dependsOn subprojects*.tasks.dependencies
12 12
 
13
-task createWrapper(type: Wrapper) {
13
+task wrapper(type: Wrapper) {
14 14
     description 'Downloads and installs an up-to-date wrapper for gradle.'
15
-    gradleVersion = '2.13'
15
+    gradleVersion = '2.14'
16 16
 }
17 17
 

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


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

@@ -1,6 +1,6 @@
1
-#Thu May 05 16:44:00 BST 2016
1
+#Mon Jul 04 18:46:31 BST 2016
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

+ 25
- 21
gradlew View File

@@ -6,12 +6,30 @@
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 27
 APP_NAME="Gradle"
13 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 33
 # Use the maximum available, or set MAX_FD != -1 to use that value.
16 34
 MAX_FD="maximum"
17 35
 
@@ -30,6 +48,7 @@ die ( ) {
30 48
 cygwin=false
31 49
 msys=false
32 50
 darwin=false
51
+nonstop=false
33 52
 case "`uname`" in
34 53
   CYGWIN* )
35 54
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
40 59
   MINGW* )
41 60
     msys=true
42 61
     ;;
62
+  NONSTOP* )
63
+    nonstop=true
64
+    ;;
43 65
 esac
44 66
 
45
-# Attempt to set APP_HOME
46
-# Resolve links: $0 may be a link
47
-PRG="$0"
48
-# Need this for relative symlinks.
49
-while [ -h "$PRG" ] ; do
50
-    ls=`ls -ld "$PRG"`
51
-    link=`expr "$ls" : '.*-> \(.*\)$'`
52
-    if expr "$link" : '/.*' > /dev/null; then
53
-        PRG="$link"
54
-    else
55
-        PRG=`dirname "$PRG"`"/$link"
56
-    fi
57
-done
58
-SAVED="`pwd`"
59
-cd "`dirname \"$PRG\"`/" >/dev/null
60
-APP_HOME="`pwd -P`"
61
-cd "$SAVED" >/dev/null
62
-
63 67
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
64 68
 
65 69
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
85 89
 fi
86 90
 
87 91
 # Increase the maximum file descriptors if we can.
88
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
89 93
     MAX_FD_LIMIT=`ulimit -H -n`
90 94
     if [ $? -eq 0 ] ; then
91 95
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

+ 3
- 3
gradlew.bat View File

@@ -8,14 +8,14 @@
8 8
 @rem Set local scope for the variables with windows NT shell
9 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 11
 set DIRNAME=%~dp0
15 12
 if "%DIRNAME%" == "" set DIRNAME=.
16 13
 set APP_BASE_NAME=%~n0
17 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 19
 @rem Find java.exe
20 20
 if defined JAVA_HOME goto findJavaFromJavaHome
21 21
 

Loading…
Cancel
Save