Unify setup, improve a few things and bump versions. (#118)

Author: vanniktech

.travis.yml

@@ -1,38 +1,42 @@
-language: groovy
+language: android
 
-groovy:
-    - 2.3.6
-    - 2.3.9
-
-jdk:
-    - oraclejdk8
+jdk: oraclejdk8
 
 before_install:
-    - pip install --user codecov
-
-install: true
+  # Download SDK
+  - yes | sdkmanager "tools" &>/dev/null
+  - yes | sdkmanager "platform-tools" &>/dev/null
+  - yes | sdkmanager "build-tools;27.0.3" &>/dev/null
+  - yes | sdkmanager "platforms;android-27" &>/dev/null
+  # Update remaining dependencies and accept licenses
+  - yes | sdkmanager --update &>/dev/null
+  - yes | sdkmanager --licenses &>/dev/null
 
 script: ./gradlew clean build
 
 after_success:
-    - .buildscript/deploy_snapshot.sh
-    - codecov
+  - bash <(curl -s https://codecov.io/bash)
+  - .buildscript/deploy_snapshot.sh
 
 env:
-    global:
-        - secure: "NffOKEC6OevydbbST6Q7w20JB0SYzQxAGjskbHBy3LcE6mEXzos9IIL/yxgLv9RG3+rOAM8fgcfKLNHTgryF7n60fPFkVWy0PSaoSZU80Kl/tPb/H8lpSzS4HJR5yPNiq2o4Ldo0QbL6NvapalVguSUVSJmOGJzKFRGNIwGedbtwZhDXjZajOcu+nSnLvID2Zh7AYGKnYZ9UFmp2eijox99jS4ROQDqzNOBlFRGs6+1zP1tpxhNqnjb4xlPcgmiwiCl3RcztXaEGeSnYWj4bXaraHzmofmV/Kwh3TZH6c0NFoEUxlPHq0+YegBHhvxMZT8xv2TvF4hV/nXkCujw0UlCf0i9gpbG4mpnXLoHlzidMb+5+oOx67+LojRpdpgfMJ25lfdUm/hD9fF4smBtVAKgR99O3E2DlPCggKwulv65Tqrukyl2J59f5oQBnFYgkLcuV20dIov6zjh89h/sEfKec2ECJKIS8RtCXaEgVhIS63mavZMWFoDagHOle1oLTzpOgzyO2hc3Yyrf/JvzHGZr843GJxK1358nAVgdUF0gotJMCiHzbNCXkHDI3jcXNpTXndN00MXnFt8Scd9QekboJhmhIHkBuwQ4lFrIduYDVVx21tQxh2PT0I4w57/RIGb7aY+cVUfe71Je4GSWL5+as5mmf9SVmzEDLi5NSsqY="
-        - secure: "Zak/kktQmLPsGaiiS2sFU73y1ePAbbUODoxzHDcx9LowfmH9Kd+8kRtVnozLjDujzALRyDlImtMmdhupphpX3ZGu3BhujtcDxv+daYM7a9LXekfDWspM/NtHSAOLMkgIgwDEhwkMg8XpOwhoUPVF0b3OegDiwEMHFI2qiV3DmdpiokW9SFHHPopSRfqAC1wHSkJLPLCk+zlnhuDpiMXmhpNR+B7ukrEohYgXAK26oDp8eVHM7SACADoG0th/omexodz+f9OnxSK8uhoD/KeVB475bShP55ntpRIB3nPC6vaNOgVbyjO2y+PEAOwyftksCIopQBOLjqvqZJ4Ewo7dDxRhuwJjcYq+YvawxD6UUaU8agPcSAi2nlTcU/R5U9PBINih7JbJTGhVnGJ2kpfYkk48uE/wY0VmEHNje9XVyETcc5HF/2HpMictdpG6T8Vm26yWT4SgSNwQ2hBEsPnhe07IVqqlKzK+xX7ELw+h7uAR7KkKV+uqMLIInX06BIgfCaqRoVuNY9AlHB6LJ/JFdS+UJ366FEjcmXWhOYvmNvMNinrbnOPOmcskgPvC1bYr2TO0by8zsjk0UsGXzvvNwZ0xQSikYzS/FkhxpI1xYUZGHuj4XgE+tYMUOB9Bk61U7GOgSZfYrdPPh4Ql8zTBE8y9RSmBddhiwtsiYG52X5Y="
+  global:
+    - secure: "NffOKEC6OevydbbST6Q7w20JB0SYzQxAGjskbHBy3LcE6mEXzos9IIL/yxgLv9RG3+rOAM8fgcfKLNHTgryF7n60fPFkVWy0PSaoSZU80Kl/tPb/H8lpSzS4HJR5yPNiq2o4Ldo0QbL6NvapalVguSUVSJmOGJzKFRGNIwGedbtwZhDXjZajOcu+nSnLvID2Zh7AYGKnYZ9UFmp2eijox99jS4ROQDqzNOBlFRGs6+1zP1tpxhNqnjb4xlPcgmiwiCl3RcztXaEGeSnYWj4bXaraHzmofmV/Kwh3TZH6c0NFoEUxlPHq0+YegBHhvxMZT8xv2TvF4hV/nXkCujw0UlCf0i9gpbG4mpnXLoHlzidMb+5+oOx67+LojRpdpgfMJ25lfdUm/hD9fF4smBtVAKgR99O3E2DlPCggKwulv65Tqrukyl2J59f5oQBnFYgkLcuV20dIov6zjh89h/sEfKec2ECJKIS8RtCXaEgVhIS63mavZMWFoDagHOle1oLTzpOgzyO2hc3Yyrf/JvzHGZr843GJxK1358nAVgdUF0gotJMCiHzbNCXkHDI3jcXNpTXndN00MXnFt8Scd9QekboJhmhIHkBuwQ4lFrIduYDVVx21tQxh2PT0I4w57/RIGb7aY+cVUfe71Je4GSWL5+as5mmf9SVmzEDLi5NSsqY="
+    - secure: "Zak/kktQmLPsGaiiS2sFU73y1ePAbbUODoxzHDcx9LowfmH9Kd+8kRtVnozLjDujzALRyDlImtMmdhupphpX3ZGu3BhujtcDxv+daYM7a9LXekfDWspM/NtHSAOLMkgIgwDEhwkMg8XpOwhoUPVF0b3OegDiwEMHFI2qiV3DmdpiokW9SFHHPopSRfqAC1wHSkJLPLCk+zlnhuDpiMXmhpNR+B7ukrEohYgXAK26oDp8eVHM7SACADoG0th/omexodz+f9OnxSK8uhoD/KeVB475bShP55ntpRIB3nPC6vaNOgVbyjO2y+PEAOwyftksCIopQBOLjqvqZJ4Ewo7dDxRhuwJjcYq+YvawxD6UUaU8agPcSAi2nlTcU/R5U9PBINih7JbJTGhVnGJ2kpfYkk48uE/wY0VmEHNje9XVyETcc5HF/2HpMictdpG6T8Vm26yWT4SgSNwQ2hBEsPnhe07IVqqlKzK+xX7ELw+h7uAR7KkKV+uqMLIInX06BIgfCaqRoVuNY9AlHB6LJ/JFdS+UJ366FEjcmXWhOYvmNvMNinrbnOPOmcskgPvC1bYr2TO0by8zsjk0UsGXzvvNwZ0xQSikYzS/FkhxpI1xYUZGHuj4XgE+tYMUOB9Bk61U7GOgSZfYrdPPh4Ql8zTBE8y9RSmBddhiwtsiYG52X5Y="
 
 branches:
-    except:
-        - gh-pages
+  except:
+    - gh-pages
 
 notifications:
-    email: false
+  email: false
 
 sudo: false
 
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
-    directories:
-        - $HOME/.gradle
-        - $HOME/.m2
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache

build.gradle

@@ -6,31 +6,43 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.gradle.publish:plugin-publish-plugin:0.9.9'
+    classpath 'com.gradle.publish:plugin-publish-plugin:0.9.10'
     classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
     classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.11.0'
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.1.0'
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.2.0'
   }
 }
 
 apply plugin: 'groovy'
-apply plugin: 'java'
+apply plugin: 'java-library'
+apply plugin: 'java-gradle-plugin'
 apply plugin: 'com.github.ben-manes.versions'
 apply plugin: 'com.gradle.plugin-publish'
 apply plugin: 'com.vanniktech.android.junit.jacoco'
 apply plugin: "com.vanniktech.maven.publish"
 
+gradlePlugin {
+  plugins {
+    androidJUnitJacocoPlugin {
+      id = 'com.vanniktech.android.junit.jacoco.GenerationPlugin'
+      implementationClass = 'com.vanniktech.android.junit.jacoco.GenerationPlugin'
+    }
+  }
+}
+
 repositories {
   mavenCentral()
   google()
   jcenter()
 }
 
 dependencies {
-  compile gradleApi()
-  compile localGroovy()
-  compile 'com.android.tools.build:gradle:3.0.1'
+  api gradleApi()
+  api localGroovy()
+
+  compileOnly 'com.android.tools.build:gradle:3.1.2'
 
+  testCompile 'com.android.tools.build:gradle:3.1.2'
   testCompile 'junit:junit:4.12'
   testCompile 'org.spockframework:spock-core:1.1-groovy-2.4', { exclude module: "groovy-all" } // Use localGroovy()
 }
@@ -52,6 +64,6 @@ pluginBundle {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.5'
+  gradleVersion = '4.7'
   distributionType = Wrapper.DistributionType.ALL
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,6 @@
 package com.vanniktech.android.junit.jacoco
 
-import com.android.build.gradle.internal.SdkHandler
 import org.gradle.testfixtures.ProjectBuilder
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -12,32 +9,24 @@ final class GenerationPluginSpec extends Specification {
   final static COMPILE_SDK_VERSION = 27
   final static BUILD_TOOLS_VERSION = "27.0.1"
   final static APPLICATION_ID = "com.example"
-  // Test fixture that emulates a local android sdk
-  final static TEST_ANDROID_SDK = getClass().getResource("/android-sdk").toURI()
-  def project
 
-  @Rule public TemporaryFolder tempDir = new TemporaryFolder()
+  def project
 
   def "setup"() {
-    File testProjectDir = tempDir.newFolder("testProject")
-    def manifest = new File('src/main/AndroidManifest.xml',testProjectDir)
-    manifest.parentFile.mkdirs()
-    manifest.write("<manifest package=\"com.example.test\">\n<application />\n</manifest>")
-
     project = ProjectBuilder.builder()
-      .withProjectDir(testProjectDir)
-      .build()
+        .build()
 
-    // Set mock test sdk, we only need to test the plugins tasks
-    SdkHandler.sTestSdkFolder = project.file TEST_ANDROID_SDK
+    def manifest = new File(project.projectDir, 'src/main/AndroidManifest.xml')
+    manifest.parentFile.mkdirs()
+    manifest.write('<manifest package="com.example.test"/>')
   }
 
   @Unroll "#projectPlugin project"() {
     given:
     project.apply plugin: projectPlugin
 
     when:
-    project.apply plugin: "com.vanniktech.android.junit.jacoco"
+    project.plugins.apply(GenerationPlugin)
 
     then:
     noExceptionThrown()
@@ -49,7 +38,7 @@ final class GenerationPluginSpec extends Specification {
   def "android - all tasks created"() {
     given:
     project.apply plugin: "com.android.application"
-    project.apply plugin: "com.vanniktech.android.junit.jacoco"
+    project.plugins.apply(GenerationPlugin)
     project.android {
       compileSdkVersion COMPILE_SDK_VERSION
       buildToolsVersion BUILD_TOOLS_VERSION
@@ -69,7 +58,7 @@ final class GenerationPluginSpec extends Specification {
   def "android [buildTypes] - all tasks created"() {
     given:
     project.apply plugin: "com.android.application"
-    project.apply plugin: "com.vanniktech.android.junit.jacoco"
+    project.plugins.apply(GenerationPlugin)
     project.android {
       compileSdkVersion COMPILE_SDK_VERSION
       buildToolsVersion BUILD_TOOLS_VERSION
@@ -95,7 +84,7 @@ final class GenerationPluginSpec extends Specification {
   def "android [buildTypes + productFlavors] - all tasks created"() {
     given:
     project.apply plugin: "com.android.application"
-    project.apply plugin: "com.vanniktech.android.junit.jacoco"
+    project.plugins.apply(GenerationPlugin)
     project.android {
       compileSdkVersion COMPILE_SDK_VERSION
       buildToolsVersion BUILD_TOOLS_VERSION
@@ -110,7 +99,7 @@ final class GenerationPluginSpec extends Specification {
       }
 
       flavorDimensions "number"
-  
+
       productFlavors {
         flavor1 {
           dimension "number"
@@ -134,7 +123,7 @@ final class GenerationPluginSpec extends Specification {
   def "android [buildTypes + productFlavors + flavorDimensions] - all tasks created"() {
     given:
     project.apply plugin: "com.android.application"
-    project.apply plugin: "com.vanniktech.android.junit.jacoco"
+    project.plugins.apply(GenerationPlugin)
     project.android {
       compileSdkVersion COMPILE_SDK_VERSION
       buildToolsVersion BUILD_TOOLS_VERSION