Update to AGP to 3.0.0

Updated Android Gradle Plugin to 3.0.0
Updated Version to 2.0 because support for versions less than 3.0.0
is no longer supported.

.travis.yml

@@ -4,8 +4,8 @@ android:
  components:
  - tools
  - platform-tools
- - build-tools-25.0.3
- - android-25
+ - build-tools-26.0.2
+ - android-26
  - extra-google-m2repository
  - extra-android-m2repository
 
@@ -18,9 +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: 
- - 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
+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:build
+ - 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:build artifactoryPublish
 
 branches:
  except:

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.0.0
+-----
+ * Support for Android Gradle Plugin 3.0.0+ only. For lower versions use 1.2.0
+
 1.2.0
 -----
  * Added support for annotation processing (#142)

README.adoc

@@ -1,6 +1,6 @@
-:groovyVersion: 2.4.11
+:groovyVersion: 2.4.12
 :pluginVersion: 1.2.0
-:pluginSnapshotVersion: 1.3.0
+:pluginSnapshotVersion: 2.0.0
 :androidPluginVersion: 2.3.2
 
 = Groovy language support for Android
@@ -70,7 +70,7 @@ buildscript {
  }
 }
  dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
  classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:{pluginSnapshotVersion}-SNAPSHOT'
  }
 }

build.gradle

@@ -16,28 +16,26 @@
 
 buildscript {
  repositories {
- jcenter()
  google()
  maven { url 'https://plugins.gradle.org/m2/' }
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
  classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.2.0'
  classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
- 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.9'
- classpath 'com.gradle.publish:plugin-publish-plugin:0.9.7'
+ classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.4'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
+ classpath 'com.gradle:build-scan-plugin:1.10'
+ classpath 'com.gradle.publish:plugin-publish-plugin:0.9.9'
  }
 }
 
 apply plugin: 'com.gradle.build-scan'
 apply from: "$rootDir/gradle/idea/idea.gradle"
 
 allprojects {
- version = '1.3.0-SNAPSHOT'
+ version = '2.0.0-SNAPSHOT'
  group = 'org.codehaus.groovy'
 
  apply plugin: 'com.github.ben-manes.versions'
@@ -74,10 +72,10 @@ buildScan {
 
 ext {
  androidPluginVersion = androidPluginVersion
- buildToolsVersion = '25.0.3'
- compileSdkVersion = 25
+ buildToolsVersion = '26.0.2'
+ compileSdkVersion = 26
  spockVersion = '1.1-groovy-2.4'
- androidSupportTestVersion = '0.5'
+ androidSupportTestVersion = '1.0.1'
  groovyVersion = '2.4.12'
 }
 

buildSrc/build.gradle

@@ -19,11 +19,12 @@ apply plugin: 'idea'
 apply from: '../gradle/versionFile.gradle'
 
 ext {
- androidGradleVersion = '2.3.3'
+ androidGradleVersion = '3.0.0'
 }
 
 repositories {
  jcenter()
+ google()
 }
 
 dependencies {

gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx2G -Dfile.encoding=UTF-8 -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true

gradle/codenarc.gradle

@@ -17,7 +17,7 @@
 project.apply plugin: "codenarc"
 
 dependencies {
- codenarc 'org.codenarc:CodeNarc:0.27.0'
+ codenarc 'org.codenarc:CodeNarc:1.0'
 }
 
 codenarc {

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.3-all.zip

groovy-android-gradle-plugin/gradle-plugin.gradle

@@ -16,7 +16,7 @@
 
 apply plugin: 'groovy'
 apply plugin: 'maven'
-apply plugin: 'nebula.optional-base'
+
 apply from: "$rootDir/gradle/publishing.gradle"
 apply from: "$rootDir/gradle/bintray.gradle"
 apply from: "$rootDir/gradle/artifactory.gradle"
@@ -30,13 +30,14 @@ sourceCompatibility = JavaVersion.VERSION_1_6
 targetCompatibility = JavaVersion.VERSION_1_6
 
 dependencies {
- compile localGroovy()
- compile gradleApi()
+ implementation localGroovy()
+ implementation gradleApi()
 
- compile "com.android.tools.build:gradle:$androidPluginVersion", optional
+ implementation "com.android.tools.build:gradle:$androidPluginVersion"
 
- testCompile gradleTestKit()
- testCompile "org.spockframework:spock-core:$spockVersion", {
+ testImplementation gradleTestKit()
+ testImplementation "com.android.tools.build:gradle:3.0.0"
+ testImplementation "org.spockframework:spock-core:$spockVersion", {
  exclude group: 'org.codehaus.groovy', module: 'groovy-all'
  }
 }
@@ -54,7 +55,11 @@ task release {
  dependsOn fullTest, artifactoryPublish, bintrayUpload, publishPlugins, rootProject.tasks.tagRelease
 }
 
-tasks.withType(Test) {
+test {
+ doFirst {
+ maxParallelForks 1
+ }
+
  systemProperty 'androidPluginVersion', androidPluginVersion
  systemProperty 'buildToolsVersion', buildToolsVersion
  systemProperty 'compileSdkVersion', compileSdkVersion

groovy-android-gradle-plugin/src/main/groovy/groovyx/GroovyAndroidExtension.groovy

@@ -16,7 +16,6 @@
 
 package groovyx
 
-import groovy.transform.PackageScope
 import groovyx.internal.AndroidGroovySourceSetFactory
 import org.gradle.api.Action
 import org.gradle.api.NamedDomainObjectContainer
@@ -107,7 +106,7 @@ class GroovyAndroidExtension {
  configClosure.execute(sourceSetsContainer)
  }
 
- @PackageScope void configure(GroovyCompile task) {
+ void configure(GroovyCompile task) {
  if (configClosure != null) {
  ConfigureUtil.configure(configClosure, task)
  }