update gradle

6 files changed, 62 insertions, 62 deletions

diff --git a/build.gradle b/build.gradle
index 5cd6c99aa..686ca9e7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ allprojects {
 
         // Show all warnings except boot classpath
         configure(options) {
+            compilerArgs << "-Xlint:all"            // Turn on all warnings
             compilerArgs << "-Xlint:-options"       // Turn off "missing" bootclasspath warning
             encoding = "utf-8"                      // Make sure source encoding is UTF-8
             incremental = true
@@ -28,7 +29,7 @@ allprojects {
     apply plugin: "maven"
 
     task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier 'sources'
+        classifier "sources"
         from sourceSets.main.allJava
     }
 
@@ -38,7 +39,7 @@ allprojects {
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier 'javadoc'
+        classifier "javadoc"
         from javadoc.destinationDir
     }
 
@@ -49,18 +50,17 @@ allprojects {
 
         exclude "**/*\$*" // otherwise gradle runs static inner classes like TestRunnerSequenceTest$SimpleTest
         testLogging {
-            events "failed"
-            exceptionFormat "short"
-
-            info {
-                events "skipped", "failed"
-                exceptionFormat "full"
-            }
+            exceptionFormat "full"
+            showCauses true
+            showExceptions true
+            showStackTraces true
+            showStandardStreams true
+            events = ["failed", "skipped"]
         }
 
         minHeapSize = "1024m"
         maxHeapSize = "2048m"
-        jvmArgs '-XX:MaxPermSize=1024m'
+        jvmArgs "-XX:MaxPermSize=1024m"
     }
 
     signing {
@@ -90,50 +90,50 @@ allprojects {
                 pom.artifactId = mavenArtifactName()
                 pom.project {
                     name project.name
-                    description = 'An alternative Android testing framework.'
-                    url = 'http://robolectric.org'
+                    description = "An alternative Android testing framework."
+                    url = "http://robolectric.org"
 
                     licenses {
                         license {
-                            name 'The MIT License'
-                            url 'https://opensource.org/licenses/MIT'
+                            name "The MIT License"
+                            url "https://opensource.org/licenses/MIT"
                         }
                     }
 
                     scm {
-                        url 'git@github.com:robolectric/robolectric.git'
-                        connection 'scm:git:git://github.com/robolectric/robolectric.git'
-                        developerConnection 'scm:git:https://github.com/robolectric/robolectric.git'
+                        url "git@github.com:robolectric/robolectric.git"
+                        connection "scm:git:git://github.com/robolectric/robolectric.git"
+                        developerConnection "scm:git:https://github.com/robolectric/robolectric.git"
                     }
 
                     developers {
                         developer {
-                            name 'Christian Williams'
-                            email 'christianw@google.com'
+                            name "Christian Williams"
+                            email "christianw@google.com"
                             organization {
-                                name 'Google Inc.'
+                                name "Google Inc."
                             }
-                            organizationUrl 'http://google.com'
+                            organizationUrl "http://google.com"
                         }
 
                         developer {
-                            name 'Jonathan Gerrish'
-                            email 'jongerrish@google.com'
+                            name "Jonathan Gerrish"
+                            email "jongerrish@google.com"
                             organization {
-                                name 'Google Inc.'
+                                name "Google Inc."
                             }
-                            organizationUrl 'http://google.com'
+                            organizationUrl "http://google.com"
                         }
                     }
                 }
 
-                def url = project.version.endsWith('-SNAPSHOT') ?
+                def url = project.version.endsWith("-SNAPSHOT") ?
                         "https://oss.sonatype.org/content/repositories/snapshots" :
                         "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
                 repository(url: url) {
                     authentication(
-                            userName: System.properties['sonatype-login'],
-                            password: System.properties['sonatype-password']
+                            userName: System.properties["sonatype-login"],
+                            password: System.properties["sonatype-password"]
                     )
                 }
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index c36958580..512197c04 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'groovy'
+apply plugin: "groovy"
 
 repositories {
     mavenLocal()
@@ -8,5 +8,5 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile 'org.apache.velocity:velocity:1.7'
+    compile "org.apache.velocity:velocity:1.7"
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2322723c7..3baa851b2 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1749b3b9c..d2960c367 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 17 16:13:48 PDT 2016
+#Wed Jul 20 18:25:23 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e269e..27309d923 100755
--- a/gradlew
+++ b/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 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"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,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`
diff --git a/gradlew.bat b/gradlew.bat
index aec99730b..f6d5974e7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell

 if "%OS%"=="Windows_NT" setlocal

 

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

-set DEFAULT_JVM_OPTS=

-

 set DIRNAME=%~dp0

 if "%DIRNAME%" == "" set DIRNAME=.

 set APP_BASE_NAME=%~n0

 set APP_HOME=%DIRNAME%

 

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

 @rem Find java.exe

 if defined JAVA_HOME goto findJavaFromJavaHome

 

@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail

 

 :init

-@rem Get command-line arguments, handling Windowz variants

+@rem Get command-line arguments, handling Windows variants

 

 if not "%OS%" == "Windows_NT" goto win9xME_args

 if "%@eval[2+2]" == "4" goto 4NT_args