Unify setup, improve a few things and bump versions.

.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:
-    - codecov
-    - .buildscript/deploy_snapshot.sh
+  - bash <(curl -s https://codecov.io/bash)
+  - .buildscript/deploy_snapshot.sh
 
 env:
-    global:
-        - secure: "MzOFFRAE6bEO5NzGQBFQ1am0lHwbsWqRdP/OTL/Ka/QgjryIETiLZdNUua23DwcJMuiMKVR0I03lqW5PCF0yT1+R8KECncF1P61YrHtATr0KhfXJ/z3DcqtxsBJ4gtVEJfuBXCgdHyYbMmS6UJVMgejCqv4YKYQggtOe/wgNm0PjwPOEQ7aktz47yEUbQOr9jxNwYDLNGzbgc9oBt+rFFYY+EfcbLQrrfq6sMyioc9c8UqNESRcAgapptwnywofd1fbgSvZ1kYpwD9scPcFgZFiG7KzNyxU0/GL2ojAT3buZFYKEToAFLTKFdHJTzwMMlUOMFoW4FB/aMlObvCcaguuMhkoD8ApaJg9Y3YLTkUzBDc6AvIvg4MwoujP6NawJJZEinG1EtuKc577WtXIpaA700s+m/go/Bsel27TUIFWnPQiPUyuyUoHvd/1xI2d1EWKZjudeaHTIhv5N8Y1W3Lb2AriSZ2ijK22I4QnrikDv1iWTaPYr8EGJbOOp4ifldLEpBJZSk8Eqv40ow5nSPNc8wmQ5Zd38wgp/qY0ZBgVOtKAUzi4t6K2hyTr7gIZ1fKyhYrIZuQFluLnQAzHQcNZM/Hlf5c9DS6tdJhSYBFbqzSlZ7UL3E98+3MZ9Bc15Z8HTlGrw1NTbLrAgpmE12PJN+oBR5U+Hay5VOJIpu+w="
-        - secure: "rhhkm3u4m9kZuDJQAtGIEW8kvwIb25bDnBJgmMR7HwCZhju1TT9nfe7kK630dj4fdVfyb9yBxHsdVRxyz8OeqxHMh0GfanJNs0rAH9aqIwXfGc8Qv7kFq9fjKojRIObvRR/0N/gJ2WXwmat7iM8AtUvNtj/hTXEcl1dd3Th9inLbuG57eS/5jT4n9czJ8Wg9nZfHXePlCFTJDEnyvmatAHvkR3CsvzUVclXGQAvw2MGA6QqXOnPDGYKX2z5scePsU0awOg0q2+H2zs2wHsyZnIf2Jn/gngWF8ij2GcVSxreX7hDBAaBhcm6KXejr81WT9sQaMCQUfFZhEo2+P86f0p2JkW1gub9h7VUQhMU1LZSHhFEWBfuNAYN2iboRJOxp7lBcTQEup+3L3mFhdwQe4f5rHyTK1t7doj+4+SLQoOmyaoTLIdZzafeQzv6JYMuJRbtDsTWSzPMzMtjzBBBC2qzVNuHiXxypNTjeOAJKDNwn5YhubTro5z5KeuM1D8/gb1TKFXOpOBUu1SJPu5CeuaP6U9D/0rny6QL2bC114qJNLTnWqEHk58lIVC/sVrWd3uxWFph6rUUEM0wgC9Uz2y2iye8OauamgfN5RP7e2ETR0NnI9USik/KuKD1MhVMh8A3q2GyaMMTEFg20dhJP40hRntb0sUxv0DW/sqIWp9I="
+  global:
+    - secure: "MzOFFRAE6bEO5NzGQBFQ1am0lHwbsWqRdP/OTL/Ka/QgjryIETiLZdNUua23DwcJMuiMKVR0I03lqW5PCF0yT1+R8KECncF1P61YrHtATr0KhfXJ/z3DcqtxsBJ4gtVEJfuBXCgdHyYbMmS6UJVMgejCqv4YKYQggtOe/wgNm0PjwPOEQ7aktz47yEUbQOr9jxNwYDLNGzbgc9oBt+rFFYY+EfcbLQrrfq6sMyioc9c8UqNESRcAgapptwnywofd1fbgSvZ1kYpwD9scPcFgZFiG7KzNyxU0/GL2ojAT3buZFYKEToAFLTKFdHJTzwMMlUOMFoW4FB/aMlObvCcaguuMhkoD8ApaJg9Y3YLTkUzBDc6AvIvg4MwoujP6NawJJZEinG1EtuKc577WtXIpaA700s+m/go/Bsel27TUIFWnPQiPUyuyUoHvd/1xI2d1EWKZjudeaHTIhv5N8Y1W3Lb2AriSZ2ijK22I4QnrikDv1iWTaPYr8EGJbOOp4ifldLEpBJZSk8Eqv40ow5nSPNc8wmQ5Zd38wgp/qY0ZBgVOtKAUzi4t6K2hyTr7gIZ1fKyhYrIZuQFluLnQAzHQcNZM/Hlf5c9DS6tdJhSYBFbqzSlZ7UL3E98+3MZ9Bc15Z8HTlGrw1NTbLrAgpmE12PJN+oBR5U+Hay5VOJIpu+w="
+    - secure: "rhhkm3u4m9kZuDJQAtGIEW8kvwIb25bDnBJgmMR7HwCZhju1TT9nfe7kK630dj4fdVfyb9yBxHsdVRxyz8OeqxHMh0GfanJNs0rAH9aqIwXfGc8Qv7kFq9fjKojRIObvRR/0N/gJ2WXwmat7iM8AtUvNtj/hTXEcl1dd3Th9inLbuG57eS/5jT4n9czJ8Wg9nZfHXePlCFTJDEnyvmatAHvkR3CsvzUVclXGQAvw2MGA6QqXOnPDGYKX2z5scePsU0awOg0q2+H2zs2wHsyZnIf2Jn/gngWF8ij2GcVSxreX7hDBAaBhcm6KXejr81WT9sQaMCQUfFZhEo2+P86f0p2JkW1gub9h7VUQhMU1LZSHhFEWBfuNAYN2iboRJOxp7lBcTQEup+3L3mFhdwQe4f5rHyTK1t7doj+4+SLQoOmyaoTLIdZzafeQzv6JYMuJRbtDsTWSzPMzMtjzBBBC2qzVNuHiXxypNTjeOAJKDNwn5YhubTro5z5KeuM1D8/gb1TKFXOpOBUu1SJPu5CeuaP6U9D/0rny6QL2bC114qJNLTnWqEHk58lIVC/sVrWd3uxWFph6rUUEM0wgC9Uz2y2iye8OauamgfN5RP7e2ETR0NnI9USik/KuKD1MhVMh8A3q2GyaMMTEFg20dhJP40hRntb0sUxv0DW/sqIWp9I="
 
 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,28 +6,39 @@ 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 {
+    androidJavadocPlugin {
+      id = 'com.vanniktech.android.javadoc'
+      implementationClass = 'com.vanniktech.android.javadoc.Generation'
+    }
+  }
+}
+
 repositories {
-  jcenter()
+  mavenCentral()
   google()
+  jcenter()
 }
 
 dependencies {
-  compile gradleApi()
-  compile localGroovy()
+  api gradleApi()
+  api localGroovy()
 
   compileOnly 'com.android.tools.build:gradle:3.1.2'
 
@@ -52,16 +63,6 @@ pluginBundle {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.5'
+  gradleVersion = '4.7'
   distributionType = Wrapper.DistributionType.ALL
 }
-
-test {
-  environment "ANDROID_HOME", System.getenv("ANDROID_HOME")
-  testLogging {
-    showStackTraces true
-    showStandardStreams = true
-    events "failed"
-    exceptionFormat "full"
-  }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -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

src/test/groovy/com/vanniktech/android/javadoc/GenerationTest.groovy

@@ -5,15 +5,11 @@ import org.gradle.api.Task
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.testfixtures.ProjectBuilder
-import org.junit.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.ExpectedException
 
-import java.nio.file.Path
-import java.nio.file.Paths
-
 class GenerationTest {
     @Rule public ExpectedException expectedException = ExpectedException.none()
 
@@ -24,7 +20,10 @@ class GenerationTest {
     void setUp() {
         generation = new Generation()
         project = ProjectBuilder.builder().withName('project').build()
-        copyManifest()
+
+        def manifestFile = new File(project.projectDir, "src/main/AndroidManifest.xml")
+        manifestFile.getParentFile().mkdirs()
+        manifestFile.setText('<manifest package="com.foo.bar"/>')
     }
 
     @Test
@@ -73,7 +72,6 @@ class GenerationTest {
 
     @Test
     void testAndroidAppProject() {
-        doNotRunOnTravis()
         withAndroidAppProject()
 
         // These tasks are only added after project.afterEvaluated() is called.
@@ -94,7 +92,6 @@ class GenerationTest {
 
     @Test
     void testAndroidAppProjectInverseApply() {
-        doNotRunOnTravis()
 
         // Apply javadoc plugin first
         generation.apply(project)
@@ -118,7 +115,6 @@ class GenerationTest {
 
     @Test
     void testAndroidLibraryProject() {
-        doNotRunOnTravis()
         withAndroidLibProject()
 
         // These tasks are only added after project.afterEvaluated() is called.
@@ -139,7 +135,6 @@ class GenerationTest {
 
     @Test
     void filterVariant() {
-        doNotRunOnTravis()
         withAndroidAppProject()
 
         project.androidJavadoc.variantFilter { variant ->
@@ -158,7 +153,6 @@ class GenerationTest {
 
     @Test
     void transformTaskName() {
-        doNotRunOnTravis()
         withAndroidAppProject()
 
         project.androidJavadoc.taskNameTransformer { variant ->
@@ -196,23 +190,6 @@ class GenerationTest {
             targetSdkVersion 27
             versionCode 1
             versionName "dev"
-
-            testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        }
-    }
-
-    private void copyManifest() {
-        Path source = Paths.get("./src/test/res/AndroidManifest.xml").toAbsolutePath().normalize()
-        Path dest = Paths.get(project.projectDir.getPath(), "src/main")
-        dest.toFile().mkdirs()
-        dest = Paths.get(dest.toString(), "AndroidManifest.xml")
-        dest.toFile() << source.toFile().text
-    }
-
-    private static void doNotRunOnTravis() { // Unless we know how to have a good ANDROID_HOME env var on travis.
-        String res = System.getenv("TRAVIS")
-        if (res != null) {
-            Assume.assumeFalse(res == "true")
         }
     }
 }