Changeset 31782 in osm

Timestamp:

2015-12-01T17:39:37+01:00 (9 years ago)

Author:

floscher

Message:

Update Gradle to 2.9 and bump dependencies to their latest versions

Location:

applications/editors/josm/plugins/mapillary

Files:

• build.gradle (modified) (2 diffs)
• gradle/wrapper/gradle-wrapper.jar (modified) ( previous)
• gradle/wrapper/gradle-wrapper.properties (modified) (1 diff)
• gradlew (modified) (3 diffs)

applications/editors/josm/plugins/mapillary/build.gradle

@@ -32 +32 @@
   compile 'org.apache.commons:commons-imaging:1.0-SNAPSHOT'
 
-  packIntoJar 'com.amazonaws:aws-java-sdk-s3:1.10.8'
-  packIntoJar 'org.apache.httpcomponents:httpmime:4.5'
+  packIntoJar 'com.amazonaws:aws-java-sdk-s3:1.10.37'
+  packIntoJar 'org.apache.httpcomponents:httpmime:4.5.1'
 
   testCompile 'junit:junit:4.12'
@@ -150 +150 @@
 }
 runJosmLatest.dependsOn installPluginToJosmLatest
-
-/** Wrapper task:
- * This only needs to be run once when the Gradle version changes.
- * The changed files (probably in the gradle/-folder) should then be commited to CVS.
- */
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.5'
-}

applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties

@@ -1 @@
-#Fri Jul 17 05:07:37 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionSha256Sum=c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f

applications/editors/josm/plugins/mapillary/gradlew

@@ -43 +43 @@
 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
@@ -62 +57 @@
 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
@@ -115 +110 @@
     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