Use maven-publish in place of older publishing

- Enables `publishToMavenLocal`
- Removes use of should-have-been-deprecated `Upload` task

Author: bigdaz

build.gradle

@@ -1,10 +1,11 @@
 import groovy.json.JsonBuilder
 
 plugins {
-    id "com.gradle.plugin-publish" version "0.12.0"
     id 'groovy'
     id 'java-gradle-plugin'
+    id 'maven-publish'
     id 'codenarc'
+    id "com.gradle.plugin-publish" version "0.12.0"
     id "org.gradle.test-retry" version "1.2.0"
 }
 
@@ -67,41 +68,36 @@ sourceSets {
     }
 }
 
-pluginBundle {
-    website = 'https://github.com/gradle/android-cache-fix-gradle-plugin'
-    vcsUrl = 'https://github.com/gradle/android-cache-fix-gradle-plugin'
-
-    description = 'Gradle plugin to fix Android caching problems'
-
+gradlePlugin {
     plugins {
         androidCacheFixPlugin {
             id = 'org.gradle.android.cache-fix'
             displayName = 'Gradle Android cache fix plugin'
-            tags = ['android', 'cache', 'fix']
-            version = project.version
+            description = 'Gradle plugin to fix Android caching problems'
+            implementationClass = 'org.gradle.android.AndroidCacheFixPlugin'
         }
     }
 }
 
-def localRepo = file("$buildDir/local-repo")
+pluginBundle {
+    website = 'https://github.com/gradle/android-cache-fix-gradle-plugin'
+    vcsUrl = 'https://github.com/gradle/android-cache-fix-gradle-plugin'
 
-artifacts {
-    runtime jar
+    tags = ['android', 'cache', 'fix']
 }
 
-tasks.register('install', Upload) {
+def localRepo = file("$buildDir/local-repo")
+
+publishing {
     repositories {
-        ivy {
+        maven {
             url = localRepo.toURI()
         }
     }
-    descriptorDestination = file("$buildDir/ivy/ivy.xml")
-    uploadDescriptor = true
-    configuration = configurations.runtime
 }
 
 tasks.withType(Test).configureEach {
-    dependsOn install
+    dependsOn publish
     systemProperty "local.repo", localRepo.toURI()
     retry {
         maxRetries = 3

src/test/groovy/org/gradle/android/SimpleAndroidApp.groovy

@@ -48,7 +48,7 @@ class SimpleAndroidApp {
                     repositories {
                         google()
                         jcenter()
-                        ivy {
+                        maven {
                             url = "${System.getProperty("local.repo")}"
                         }
                     }