Merge branch 'bbarnhill-upgrade_dependencies'

build.gradle

@@ -28,7 +28,7 @@ configurations {
 dependencies {
 	testCompile	'junit:junit:4.12',
 				'org.hamcrest:hamcrest-all:1.3'
-	gradleTest 'com.android.tools.build:gradle:1.3.1'
+	gradleTest 'com.android.tools.build:gradle:1.5.0'
 }
 
 sourceCompatibility = 1.6
@@ -97,7 +97,7 @@ pluginBundle {
 }
 
 ext {
-	gradleVersions = '2.4,2.5,2.6,2.7,2.8'
+	gradleVersions = '2.4,2.5,2.6,2.7,2.8,2.9'
 }
 
 task integTest(type: Test) {
@@ -128,7 +128,7 @@ integTest.dependsOn gradleTest
 check.dependsOn integTest
 
 jacoco {
-	toolVersion = "0.7.4.201502262128"
+	toolVersion = "0.7.5.201505241946"
 }
 
 jacocoTestReport {
@@ -144,6 +144,6 @@ jacocoTestReport.dependsOn test
 check.dependsOn jacocoTestReport
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.8'
+    gradleVersion = '2.9'
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 22 19:43:29 EDT 2015
+#Wed Nov 18 20:49:36 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip

gradlew

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