Update to Kotlin 1.3.11 Gradle 5.1.1 Android Build Tools Plugin 3.3.0

Author: Rolf-Smit

gradle/dependencies.gradle

@@ -3,14 +3,13 @@ ext {
             minSdk      : 21,
             targetSdk   : 28,
             compileSdk  : 28,
-            // Kotlin version is used in multiple places hence it is available as version variable
-            kotlin      : "1.2.71"
+            kotlin      : "1.3.11"
     ]
     projectDependency = [
 
             // Gradle Plugins
             kotlinPlugin      : "org.jetbrains.kotlin:kotlin-gradle-plugin:${projectVersion.kotlin}",
-            gradlePlugin      : "com.android.tools.build:gradle:3.2.1",
+            gradlePlugin      : "com.android.tools.build:gradle:3.3.0",
 
             // Dependencies
             kotlinStdlibJdk7  : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${projectVersion.kotlin}",

gradle/wrapper/gradle-wrapper.properties

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

plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/RootCoveragePlugin.kt

@@ -71,7 +71,12 @@ class RootCoveragePlugin : Plugin<Project> {
             list.add("jacoco/test*UnitTest.exec")
         }
         if (rootProjectExtension.testTypes.contains(TestVariantBuildOutput.TestType.ANDROID_TEST)) {
+
+            // Android Build Tools Plugin 3.2
             list.add("outputs/code-coverage/connected/*coverage.ec")
+
+            // Android Build Tools Plugin 3.3+
+            list.add("outputs/code_coverage/*/connected/*coverage.ec")
         }
         return list
     }
@@ -191,11 +196,9 @@ class RootCoveragePlugin : Plugin<Project> {
         }
 
         // Collect the class files based on the Java Compiler output
-        val javaClassTrees = variant.javaCompiler.outputs.files.map { file ->
+        val javaClassTrees = variant.javaCompileProvider.get().outputs.files.map { file ->
             project.fileTree(file, excludes = getFileFilterPatterns()).excludeNonClassFiles()
         }
-        // Hard coded alternative to get class files for Java.
-        //val classesTree = project.fileTree(mapOf("dir" to "${project.buildDir}/intermediates/classes/${variant.dirName}", "excludes" to getFileFilterPatterns()))
 
         // TODO: No idea how to dynamically get the kotlin class files output folder, so for now this is hardcoded.
         // TODO: For some reason the tmp/kotlin-classes folder does not use the variant.dirName property, for now we instead use the variant.name.
@@ -219,21 +222,9 @@ class RootCoveragePlugin : Plugin<Project> {
         // Make the root task depend on the sub-project code coverage task
         rootTask.dependsOn(subModuleTask)
 
-        // Set or add the sub-task class directories to the root task
-        if (rootTask.classDirectories == null) {
-            rootTask.classDirectories = subModuleTask.classDirectories
-        } else {
-            rootTask.classDirectories += subModuleTask.classDirectories
-        }
-
-        // Set or add the sub-task source directories to the root task
-        if (rootTask.sourceDirectories == null) {
-            rootTask.sourceDirectories = subModuleTask.sourceDirectories
-        } else {
-            rootTask.sourceDirectories += subModuleTask.sourceDirectories
-        }
-
-        // Add the sub-task class directories to the root task
-        rootTask.executionData(subModuleTask.executionData)
+        // Add the sub-task class directories, source directories and executionData to the root task
+        rootTask.classDirectories.from(subModuleTask.classDirectories)
+        rootTask.sourceDirectories.from(subModuleTask.sourceDirectories)
+        rootTask.executionData.from(subModuleTask.executionData)
     }
 }