Skip to content

Commit 013678a

Browse files
jbornemannjdigger
authored andcommitted
Now uses 2.3 generated Gradle wrapper
Removed the travis-gradlew wrapped wrapper, as it is no longer needed with new wrapper.
1 parent ddfb572 commit 013678a

File tree

7 files changed

+9
-25
lines changed

7 files changed

+9
-25
lines changed

.gradle-wrapper/gradle-wrapper.jar

-45.6 KB
Binary file not shown.

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,5 @@ sudo: false
2424
env:
2525
- GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=''"
2626

27-
#Travis will mark a build as a failed if the script/install process exits(1). Since the normal Gradle wrapper exits 0 even if the test runner reports failures, we have to wrap the wrapper.
28-
#We want to replace the default install task. Travis automatically adds "./gradlew assemble" if it detects a gradle project
29-
install: ./travis-gradlew assemble
30-
script: ./travis-gradlew check
27+
install: ./gradlew assemble
28+
script: ./gradlew check

gradle/wrapper/gradle-wrapper.jar

50.9 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 24 17:31:03 MDT 2012
1+
#Mon Jul 06 16:25:58 MDT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http:\//services.gradle.org/distributions/gradle-2.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip

gradlew

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ while [ -h "$PRG" ] ; do
6161
fi
6262
done
6363
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/"
64+
cd "`dirname \"$PRG\"`/" >&-
6565
APP_HOME="`pwd -P`"
66-
cd "$SAVED"
66+
cd "$SAVED" >&-
6767

68-
CLASSPATH=$APP_HOME/.gradle-wrapper/gradle-wrapper.jar
68+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6969

7070
# Determine the Java command to use to start the JVM.
7171
if [ -n "$JAVA_HOME" ] ; then
@@ -161,9 +161,4 @@ function splitJvmOpts() {
161161
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162162
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163163

164-
"$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
165-
166-
# stop the daemon on windows systems to close file locks left open on some files made by gradle
167-
if [ "$cygwin" = "true" -o "$msys" = "true" ]; then
168-
"$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain --stop
169-
fi
164+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$
6969
:execute
7070
@rem Setup the command line
7171

72-
set CLASSPATH=%APP_HOME%\.gradle-wrapper\gradle-wrapper.jar
72+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7373

7474
@rem Execute Gradle
7575
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

travis-gradlew

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)