From 446f0cb85f5b16e7948caec91cef94e979682d6e Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Sat, 7 May 2016 11:24:15 -0700 Subject: Upgrade to Gradle 2.13 This improves our documentation for the gradle protobuf plugin, as its version is dependent on the gradle version. Gradle now has the --tests flag, performance improvements, and support for OpenPGP subkeys. --- README.md | 4 ++- android-interop-testing/build.gradle | 2 +- build.gradle | 2 +- examples/android/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- gradlew | 46 +++++++++++++++++--------------- gradlew.bat | 6 ++--- 7 files changed, 36 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index c5a6b547c..bafd90d1a 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.4' + // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier + // gradle versions + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7' } } diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index caa3f546d..4d30e86d7 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.0' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.4" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.7" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/build.gradle b/build.gradle index 9c2d3c301..91318aa6a 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,7 @@ subprojects { okio: 'com.squareup.okio:okio:1.6.0', protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}", protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}", - protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.4', + protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.7', protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}", netty: 'io.netty:netty-codec-http2:[4.1.0.CR7]', diff --git a/examples/android/build.gradle b/examples/android/build.gradle index 913025d0e..493f43970 100644 --- a/examples/android/build.gradle +++ b/examples/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.0' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.4" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.7" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c1d12064..ae20da0b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 02 09:04:21 PST 2016 +#Sat May 07 11:11:12 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip diff --git a/gradlew b/gradlew index 9d82f7891..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,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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 - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,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 diff --git a/gradlew.bat b/gradlew.bat index 72d362daf..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 -- cgit v1.2.3