Moved source from buildSrc to plugin folder + submodule tasks are no longer of the JacocoReport type.

Author: Rolf-Smit

.gitignore

@@ -11,3 +11,4 @@
 .externalNativeBuild
 .idea/
 *.exec
+repo/

app/build.gradle

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "org.neotech.app.multimoduleapplication"
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -25,12 +24,6 @@ android {
     }
 }
 
-/*
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-}
-*/
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 

build.gradle

@@ -3,22 +3,37 @@ apply plugin: 'jacoco'
 apply plugin: 'org.neotech.library.rootcoverage'
 
 buildscript {
+    ext.versions = [
+            minSdk: 21,
+            targetSdk: 28,
+            compileSdk: 28,
+            kotlin: "1.2.71",
+            gradlePlugin: "3.1.4"
+    ]
     ext.deps = [
-            kotlinPlugin: 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71',
-            gradlePlugin: 'com.android.tools.build:gradle:3.1.4',
-            kotlinStdlibJdk7: 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71'
+            kotlinPlugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
+            gradlePlugin: "com.android.tools.build:gradle:${versions.gradlePlugin}",
+            kotlinStdlibJdk7: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
     ]
 
     repositories {
         google()
         jcenter()
-        //mavenCentral() //Jacoco is only on mavenCentral
+
+        // Local maven repository for development purposes.
+        maven {
+            url uri('/repo')
+        }
     }
     dependencies {
         classpath deps.gradlePlugin
         classpath deps.kotlinPlugin
-       // classpath "org.jacoco:org.jacoco.core:0.8.2"
 
+        // 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'
+
+        classpath 'org.neotech.plugin:android-root-coverage-plugin:1.0.0-SNAPSHOT'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -28,7 +43,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        //mavenCentral()
     }
 }
 
@@ -41,7 +55,6 @@ jacoco {
     toolVersion = "0.8.2"
 }
 
-
 rootCoverage {
     buildVariant "debug"
     //excludes ["**/library.a/**"]

buildSrc/build.gradle

@@ -12,3 +12,23 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+GROUP=org.neotech.plugin
+VERSION_NAME=1.0.0-SNAPSHOT
+
+BINTRAY_REPO=maven
+BINTRAY_LICENCE=Apache-2.0
+
+POM_DESCRIPTION=A Gradle plugin for easy generation of combined code coverage reports for Android projects with multiple modules.
+
+POM_URL=https://github.com/NeoTech-Software/android-root-coverage-plugin
+POM_SCM_URL=https://github.com/NeoTech-Software/android-root-coverage-plugin
+POM_SCM_CONNECTION=scm:git:git://github.com/NeoTech-Software/android-root-coverage-plugin.git
+POM_SCM_DEV_CONNECTION=scm:git:git://github.com/NeoTech-Software/android-root-coverage-plugin.git
+
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=rolf-smit
+POM_DEVELOPER_NAME=Rolf Smit
+POM_DEVELOPER_EMAIL=[email protected]

gradle.properties

@@ -4,5 +4,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = "7"
-targetCompatibility = "7"
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8

java_module/build.gradle

@@ -3,17 +3,21 @@ apply plugin: 'kotlin-android'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion versions.compileSdk
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         debug {
             testCoverageEnabled true
@@ -24,11 +28,6 @@ android {
         }
     }
 }
-/*
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-}
-*/
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])

library_a/build.gradle

@@ -3,17 +3,21 @@ apply plugin: 'kotlin-android'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion versions.compileSdk
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         debug {
             testCoverageEnabled true
@@ -25,12 +29,6 @@ android {
     }
 }
 
-/*
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-}
-*/
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 

library_b/build.gradle

@@ -0,0 +1,35 @@
+apply plugin: 'java-gradle-plugin'
+apply plugin: 'kotlin'
+apply plugin: 'maven'
+
+// To upload new artifact to maven:
+// > gradlew install
+// > gradlew bintrayUpload
+
+//Without this line the Bintray upload will fail as it uses the module directory name as artifactId
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+dependencies {
+    implementation gradleApi()
+    implementation deps.kotlinPlugin
+    implementation deps.gradlePlugin
+    implementation deps.kotlinStdlibJdk7
+}
+
+// For publishing to local maven repository for development purposes.
+uploadArchives {
+    dependsOn install
+    repositories {
+        mavenDeployer {
+            repository(url: uri('../repo'))
+        }
+    }
+}
+
+// For publishing to external maven repository
+archivesBaseName = POM_ARTIFACT_ID
+group = GROUP
+version = VERSION_NAME
+apply from: rootProject.file('publish.gradle')