Skip to content

Commit

Permalink
Upgrade gradle wrapper
Browse files Browse the repository at this point in the history
And clean up other dependencies. Fixes entagen#68 for those not using ancient versions of gradle and not using the gradle wrapper.
  • Loading branch information
jamesdh authored and Phil Rosegay committed Sep 24, 2018
1 parent 9b92eb7 commit ef72804
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 15 deletions.
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ repositories {
}

dependencies {
groovy 'org.codehaus.groovy:groovy-all:1.8.8'
compile 'org.apache.ivy:ivy:2.2.0'
compile 'commons-cli:commons-cli:1.2' // should be part of groovy, but not available when running for some reason
compile 'org.codehaus.groovy:groovy-all:2.4.6'
compile 'commons-cli:commons-cli:1.3.1'
testCompile 'junit:junit:4.10'
compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
}
Expand Down Expand Up @@ -40,7 +39,7 @@ task syncWithRepo(dependsOn: 'classes', type: JavaExec) {
}

task wrapper(type: Wrapper) {
gradleVersion = '1.0'
gradleVersion = '2.9'
}


Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jun 20 11:41:01 CDT 2012
#Wed Jun 01 20:35:21 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
14 changes: 5 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

##############################################################################
##
Expand Down Expand Up @@ -42,11 +42,6 @@ case "`uname`" in
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
Expand All @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED"
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

Expand Down Expand Up @@ -101,7 +96,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

Expand All @@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down

0 comments on commit ef72804

Please sign in to comment.