Feature/gradle plugin portal publish (#2)

- Gradle Portal publishing
- Use the new Plugins DSL

Author: Rolf-Smit

README.md

@@ -23,7 +23,7 @@ apply plugin: 'org.neotech.plugin.rootcoverage'
 buildscript {
     dependencies {
         // Step 1: add the dependency
-        classpath 'org.neotech.plugin:android-root-coverage-plugin:1.0.0'
+        classpath 'org.neotech.plugin:android-root-coverage-plugin:1.0.1'
     }
 }
 ```

build.gradle

@@ -8,17 +8,6 @@ buildscript {
         google()
         jcenter()
     }
-    dependencies {
-        classpath projectDependency.gradlePlugin
-        classpath projectDependency.kotlinPlugin
-
-        // Bintray & Maven for publishing
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
 }
 
 allprojects {

gradle.properties

@@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xmx1536m
 #PACKAGING=jar
 
 GROUP=org.neotech.plugin
-VERSION=1.0.0
+VERSION=1.0.1
 DESCRIPTION=A Gradle plugin for easy generation of combined code coverage reports for Android projects with multiple modules.
 
 PROJECT_WEBSITE=https://github.com/NeoTech-Software/android-root-coverage-plugin

gradle/dependencies.gradle

@@ -25,6 +25,7 @@ ext {
 
     // Used by the plugin-version-handler.gradle
     pluginVersions = [
-            "org.jetbrains.kotlin.android": "${projectVersion.kotlin}"
+            "org.jetbrains.kotlin.android": "${projectVersion.kotlin}",
+            "org.jetbrains.kotlin.jvm": "${projectVersion.kotlin}"
     ]
 }

plugin/build.gradle

@@ -1,9 +1,17 @@
-apply plugin: 'kotlin'
-apply plugin: 'java-gradle-plugin'
-apply plugin: 'maven'
+plugins {
+    id "org.jetbrains.kotlin.jvm"
+    id "java-gradle-plugin"
 
-// To upload new plugin artifact to maven:
-// > gradlew bintrayUpload
+    // For publishing to Plugin Portal
+    id "com.gradle.plugin-publish" version "0.10.0"
+
+    // Bintray & Maven for publishing
+    id "com.github.dcendents.android-maven" version "2.1"
+    id "com.jfrog.bintray" version "1.8.4"
+}
+
+// To upload new plugin artifact to maven and Gradle Portal:
+// > gradlew bintrayUpload publishPlugins
 //
 // To test the plugin:
 // > gradlew clean test
@@ -20,6 +28,25 @@ gradlePlugin {
     }
 }
 
+pluginBundle {
+    website = PROJECT_WEBSITE
+    vcsUrl = 'https://github.com/NeoTech-Software/Android-Root-Coverage-Plugin'
+    description = DESCRIPTION
+    tags = ['android', 'coverage', 'jacoco', 'code-coverage', 'coverage-report', 'aggregated-report']
+
+    plugins {
+        rootCoverage {
+            displayName = 'Android-Root-Coverage-Plugin'
+        }
+    }
+
+    mavenCoordinates {
+        groupId = GROUP
+        artifactId = ARTIFACT_ID
+        version = VERSION
+    }
+}
+
 dependencies {
     compileOnly gradleApi()
     implementation projectDependency.gradlePlugin

plugin/src/test/test-fixtures/multi-module/build.gradle

@@ -17,12 +17,9 @@ buildscript {
 }
 
 plugins {
-    // Prevent adding this plugin to all submodules (default behaviour)
-    id 'org.neotech.plugin.rootcoverage' apply false
+    id 'jacoco'
+    id 'org.neotech.plugin.rootcoverage'
 }
-// Add the plugin just to this module
-apply plugin: 'jacoco'
-apply plugin: 'org.neotech.plugin.rootcoverage'
 
 allprojects {
     repositories {

publish.gradle

@@ -1,4 +1,8 @@
-apply plugin: 'maven'
+// This file only works if the project that includes it defines:
+// plugins {
+//     id "com.github.dcendents.android-maven" version "2.1"
+//     id "com.jfrog.bintray" version "1.8.4"
+// }
 
 // project.archivesBaseName is added by the Maven plugin to the project, the value defaults to the
 // project.name property, but since project.name is basically the current folder name the desired
@@ -88,9 +92,6 @@ artifacts {
     }
 }
 
-// Bintray
-apply plugin: 'com.jfrog.bintray'
-
 Properties properties = new Properties()
 properties.load(project.rootProject.file("local.properties").newDataInputStream())
 

settings.gradle

@@ -1 +1,7 @@
+// See plugin-version-handler.gradle for an explanation why this is here.
+pluginManagement {
+    apply from: "gradle/plugin-version-handler.gradle", to: pluginManagement
+}
+
+
 include ':plugin'