Update gradle version

.travis.yml

@@ -18,8 +18,9 @@ before_install:
   - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
   - cat /etc/hosts # optionally check the content *after*
 
-script: ./gradlew -q -s -Dscan -PbuildInfo.build.number=$TRAVIS_BUILD_NUMBER -PbuildInfo.buildUrl=https://travis-ci.org/${TRAVIS_REPO_SLUG}/builds/${TRAVIS_JOB_ID}
-  -PbuildInfo.buildAgent.name=$USER -PbuildInfo.principal=$USER --debug --info clean assemble check fullTest artifactoryPublish
+script: 
+  - travis_wait 30 ./gradlew -q -s -PbuildInfo.build.number=$TRAVIS_BUILD_NUMBER -PbuildInfo.buildUrl=https://travis-ci.org/${TRAVIS_REPO_SLUG}/builds/${TRAVIS_JOB_ID} -PbuildInfo.buildAgent.name=$USER -PbuildInfo.principal=$USER clean :groovy-android-sample-app:assemble :groovy-android-sample-app:check
+  - travis_wait 30 ./gradlew -q -s -Dscan -PbuildInfo.build.number=$TRAVIS_BUILD_NUMBER -PbuildInfo.buildUrl=https://travis-ci.org/${TRAVIS_REPO_SLUG}/builds/${TRAVIS_JOB_ID} -PbuildInfo.buildAgent.name=$USER -PbuildInfo.principal=$USER :groovy-android-gradle-plugin:assemble :groovy-android-gradle-plugin:check fullTest artifactoryPublish
 
 branches:
   except:

README.adoc

@@ -70,7 +70,7 @@ buildscript {
   }
 }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.2.0'
+    classpath 'com.android.tools.build:gradle:2.3.3'
     classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:{pluginSnapshotVersion}-SNAPSHOT'
   }
 }

build.gradle

@@ -17,6 +17,7 @@
 buildscript {
   repositories {
     jcenter()
+    google()
     maven { url 'https://plugins.gradle.org/m2/' }
   }
 
@@ -27,7 +28,7 @@ buildscript {
     classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.4.12'
     classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
     classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.2.0'
-    classpath 'com.gradle:build-scan-plugin:1.7.4'
+    classpath 'com.gradle:build-scan-plugin:1.9'
     classpath 'com.gradle.publish:plugin-publish-plugin:0.9.7'
   }
 }
@@ -62,6 +63,7 @@ subprojects {
 
   repositories {
     jcenter()
+    google()
   }
 }
 

buildSrc/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'idea'
 apply from: '../gradle/versionFile.gradle'
 
 ext {
-  androidGradleVersion = '2.2.0'
+  androidGradleVersion = '2.3.3'
 }
 
 repositories {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Apr 14 08:59:00 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

groovy-android-gradle-plugin/src/test/groovy/groovyx/functional/FullCompilationSpec.groovy

@@ -243,6 +243,7 @@ class FullCompilationSpec extends FunctionalSpec {
     'JavaVersion.VERSION_1_7'       | '2.3.0'              | '3.4'
     'JavaVersion.VERSION_1_7'       | '2.3.1'              | '3.5'
     'JavaVersion.VERSION_1_7'       | '2.3.2'              | '3.5'
+    'JavaVersion.VERSION_1_7'       | '2.3.3'              | '4.2'
   }
 
   @Unroll
@@ -405,5 +406,6 @@ class FullCompilationSpec extends FunctionalSpec {
     'JavaVersion.VERSION_1_7'       | '2.3.0'              | '3.4'
     'JavaVersion.VERSION_1_7'       | '2.3.1'              | '3.5'
     'JavaVersion.VERSION_1_7'       | '2.3.1'              | '3.5'
+    'JavaVersion.VERSION_1_7'       | '2.3.3'              | '4.2'
   }
 }

groovy-android-gradle-plugin/src/test/groovy/groovyx/functional/FunctionalSpec.groovy

@@ -28,6 +28,7 @@ import spock.lang.Specification
 abstract class FunctionalSpec extends Specification implements FileHelper {
 
   static final String PLUGIN_VERSION = FunctionalSpec.classLoader.getResource('groovyx/groovy-android-gradle-plugin-version.txt').text.trim()
+  static final String QUIET_ARGUMENT = '--quiet'
 
   @Rule TemporaryFolder dir
 
@@ -37,7 +38,7 @@ abstract class FunctionalSpec extends Specification implements FileHelper {
         .withDebug(true) // always run inline to save memory, especially on CI
         .forwardOutput()
         .withTestKitDir(getTestKitDir())
-        .withArguments(args.toList())
+        .withArguments(args.toList() + QUIET_ARGUMENT)
         .withGradleVersion(gradleVersion?:GradleVersion.current().version)
   }
 

groovy-android-gradle-plugin/src/test/groovy/groovyx/internal/TestProperties.groovy

@@ -23,7 +23,7 @@ abstract class TestProperties {
   }
 
   static String getAndroidPluginVersion() {
-    return System.getProperty('androidPluginVersion')?:'2.3.2'
+    return System.getProperty('androidPluginVersion')?:'2.3.3'
   }
 
   static String getBuildToolsVersion() {

groovy-android-sample-app/proguard-rules.txt

@@ -11,4 +11,6 @@
 
 -dontwarn org.codehaus.groovy.**
 -dontwarn groovy**
+-dontnote org.codehaus.groovy.**
+-dontnote groovy**