Merge branch 'release/1.7' into 'master' (#93)

Author: Rolf-Smit

.gitignore

@@ -16,3 +16,4 @@ build/
 */out/*/classes/*
 plugin/src/test/test-fixtures/multi-module/gradle.properties
 plugin/src/test/test-fixtures/multi-module/build.gradle
+plugin/src/test/test-fixtures/multi-module/app/build.gradle

README.md

@@ -29,7 +29,7 @@ following methods:
   ```groovy
   // Below buildscript {}
   plugins {
-      id "nl.neotech.plugin.rootcoverage" version "1.7.0"
+      id "nl.neotech.plugin.rootcoverage" version "1.7.1"
   }
   ```
 </details>
@@ -42,7 +42,7 @@ following methods:
    
    buildscript {
       dependencies {
-         classpath 'nl.neotech.plugin:android-root-coverage-plugin:1.7.0'
+         classpath 'nl.neotech.plugin:android-root-coverage-plugin:1.7.1'
       }
    }
    ```
@@ -141,7 +141,7 @@ rootCoverage {
 |--------------------|--------------------------------------------------------------------------------------------------------------|-------------------|
 | **1.8.0-SNAPSHOT** | 8.3.0-alpha05                                                                                                | 8.4+ *(note 1)*   |
 | **Note 2**         | 8.0-8.3.0-alpha04                                                                                            | n.a.              |
-| **1.7.0**          | 7.4                                                                                                          | 7.5+              |
+| **1.7.1**          | 7.4                                                                                                          | 7.5+              |
 | **1.6.0**          | 7.3                                                                                                          | 7.4+              |
 | **1.5.3**          | 7.2                                                                                                          | 7.3+              |
 | **Note 3**         | 7.0-7.2.0-alpha05                                                                                            | n.a.              |

gradle/libs.versions.toml

@@ -11,15 +11,17 @@ androidGradlePlugin    = { module = "com.android.tools.build:gradle",       vers
 androidGradlePluginApi = { module = "com.android.tools.build:gradle-api",   version.ref = "androidGradlePlugin" }
 
 # Test dependencies
-junit               = { module = "junit:junit",                             version = "4.13.2" }
-truth               = { module = "com.google.truth:truth",                  version = "1.1.3" }
-supportTestRunner   = { module = "androidx.test:runner",                    version = "1.5.2" }
-espressoCore        = { module = "androidx.test.espresso:espresso-core",    version = "3.5.1" }
-androidJUnit        = { module = "androidx.test.ext:junit",                 version = "1.1.5" }
-commonsCsv          = { module = "org.apache.commons:commons-csv",          version = "1.10.0" }
-kotlinTest          = { module = "org.jetbrains.kotlin:kotlin-test",        version.ref = "kotlin" }
-robolectric         = { module = "org.robolectric:robolectric",             version = "4.10.2" }
-mockk               = { module = "io.mockk:mockk",                          version = "1.13.5" }
+junit               = { module = "junit:junit",                                              version = "4.13.2" }
+truth               = { module = "com.google.truth:truth",                                   version = "1.1.3" }
+supportTestRunner   = { module = "androidx.test:runner",                                     version = "1.5.2" }
+espressoCore        = { module = "androidx.test.espresso:espresso-core",                     version = "3.5.1" }
+androidJUnit        = { module = "androidx.test.ext:junit",                                  version = "1.1.5" }
+commonsCsv          = { module = "org.apache.commons:commons-csv",                           version = "1.10.0" }
+kotlinTest          = { module = "org.jetbrains.kotlin:kotlin-test",                         version.ref = "kotlin" }
+robolectric         = { module = "org.robolectric:robolectric",                              version = "4.10.2" }
+mockk               = { module = "io.mockk:mockk",                                           version = "1.13.5" }
+jacksonYaml         = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.15.3"}
+jacksonKotlin       = { module = "com.fasterxml.jackson.module:jackson-module-kotlin",       version = "2.15.3"}
 
 [bundles]
 androidInstrumentedTest = ["supportTestRunner", "espressoCore", "androidJUnit"]

plugin/build.gradle

@@ -87,6 +87,8 @@ dependencies {
     testImplementation libs.bundles.jvmTest
     testImplementation gradleTestKit()
     testImplementation libs.mockk
+    testImplementation libs.jacksonYaml
+    testImplementation libs.jacksonKotlin
 }
 
 // Setup Jacoco for Gradle TestKit

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

@@ -35,7 +35,7 @@ internal fun RootCoveragePluginExtension.getFileFilterPatterns(): List<String> =
 internal fun RootCoveragePluginExtension.getBuildVariantFor(project: Project): String =
     buildVariantOverrides[project.path] ?: buildVariant
 
-internal fun Project.getExecutionDataFileTree(includeUnitTestResults: Boolean, includeAndroidTestResults: Boolean): FileTree? {
+internal fun Project.getExecutionDataFileTree(includeUnitTestResults: Boolean, includeConnectedDevicesResults: Boolean, includeGradleManagedDevicesResults: Boolean): FileTree? {
     val buildFolderPatterns = mutableListOf<String>()
     if (includeUnitTestResults) {
         // TODO instead of hardcoding this, obtain the location from the test tasks, something like this?
@@ -54,7 +54,7 @@ internal fun Project.getExecutionDataFileTree(includeUnitTestResults: Boolean, i
         // Android Build Tools Plugin 7.0+
         buildFolderPatterns.add("outputs/unit_test_code_coverage/*/*.exec")
     }
-    if (includeAndroidTestResults) {
+    if (includeConnectedDevicesResults) {
 
         // These are legacy paths for older now unsupported AGP version, they are just here for
         // reference and are not added to prevent existing files from polluting results
@@ -67,7 +67,8 @@ internal fun Project.getExecutionDataFileTree(includeUnitTestResults: Boolean, i
 
         // Android Build Tools Plugin 7.1+
         buildFolderPatterns.add("outputs/code_coverage/*/connected/*/coverage.ec")
-
+    }
+    if(includeGradleManagedDevicesResults) {
         // Gradle Managed Devices 7.4
         // buildFolderPatterns.add("outputs/managed_device_code_coverage/*/coverage.ec")
 

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

@@ -145,6 +145,9 @@ class RootCoveragePlugin : Plugin<Project> {
         if (rootProjectExtension.shouldExecuteUnitTests() && (buildType.enableUnitTestCoverage || buildType.isTestCoverageEnabled)) {
             dependsOn("$path:test${name}UnitTest")
         }
+
+        var runsOnGradleManagedDevices = false
+
         if (rootProjectExtension.shouldExecuteAndroidTests() && (buildType.enableAndroidTestCoverage || buildType.isTestCoverageEnabled)) {
 
             // Attempt to run on instrumented tests, giving priority to the following devices in this order:
@@ -153,16 +156,26 @@ class RootCoveragePlugin : Plugin<Project> {
             // - All through ADB connected devices.
             val gradleManagedDevices = subProject.extensions.getByType(BaseExtension::class.java).testOptions.managedDevices.devices
             if (rootProjectExtension.runOnGradleManagedDevices && !rootProjectExtension.gradleManagedDeviceName.isNullOrEmpty()) {
+                runsOnGradleManagedDevices = true
                 dependsOn("$path:${rootProjectExtension.gradleManagedDeviceName}${name}AndroidTest")
             } else if (rootProjectExtension.runOnGradleManagedDevices && gradleManagedDevices.isNotEmpty()) {
+                runsOnGradleManagedDevices = true
                 dependsOn("$path:allDevices${name}AndroidTest")
             } else {
                 dependsOn("$path:connected${name}AndroidTest")
             }
         } else {
             // If this plugin should not run instrumented tests on it's own, at least make sure it runs after those tasks (if they are
-            // selected to run as well).
-            mustRunAfter("$path:allDevices${name}AndroidTest")
+            // selected to run as well and exists).
+            //
+            // In theory we don't need to do this if `rootProjectExtension.includeAndroidTestResults` is false, so we could check that, but
+            // it also does not hurt.
+
+            val executeAndroidTestsOnGradleManagedDevicesTask = project.tasks.findByPath("$path:allDevices${name}AndroidTest")
+            if(executeAndroidTestsOnGradleManagedDevicesTask != null) {
+                // This task only exists if a Gradle Managed Device is configured, which may not be the case.
+                mustRunAfter("$path:allDevices${name}AndroidTest")
+            }
             mustRunAfter("$path:connected${name}AndroidTest")
         }
 
@@ -181,7 +194,8 @@ class RootCoveragePlugin : Plugin<Project> {
         executionData.from(
             subProject.getExecutionDataFileTree(
                 includeUnitTestResults = rootProjectExtension.includeUnitTestResults && (buildType.enableUnitTestCoverage || buildType.isTestCoverageEnabled),
-                includeAndroidTestResults = rootProjectExtension.includeAndroidTestResults && (buildType.enableAndroidTestCoverage || buildType.isTestCoverageEnabled)
+                includeConnectedDevicesResults = rootProjectExtension.includeAndroidTestResults && (buildType.enableAndroidTestCoverage || buildType.isTestCoverageEnabled) && !runsOnGradleManagedDevices,
+                includeGradleManagedDevicesResults = rootProjectExtension.includeAndroidTestResults && (buildType.enableAndroidTestCoverage || buildType.isTestCoverageEnabled) && runsOnGradleManagedDevices
             )
         )
     }