Prevent Jacoco convention plugins to enable test coverage on release buildTypes

leading to "debuggable" release builds.

build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt

@@ -21,20 +21,16 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.testing.jacoco.plugins.JacocoPlugin
 
 class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            apply(plugin = "jacoco")
+            apply<JacocoPlugin>()
-
+            configureJacoco(
-            val androidExtension = extensions.getByType<ApplicationExtension>()
+                commonExtension = extensions.getByType<ApplicationExtension>(),
-
+                androidComponentsExtension = extensions.getByType<ApplicationAndroidComponentsExtension>(),
-            androidExtension.buildTypes.configureEach {
+            )
-                enableAndroidTestCoverage = true
-                enableUnitTestCoverage = true
-            }
-
-            configureJacoco(extensions.getByType<ApplicationAndroidComponentsExtension>())
         }
     }
 }

build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt

@@ -21,20 +21,16 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.testing.jacoco.plugins.JacocoPlugin
 
 class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            apply(plugin = "jacoco")
+            apply<JacocoPlugin>()
-
+            configureJacoco(
-            val androidExtension = extensions.getByType<LibraryExtension>()
+                commonExtension = extensions.getByType<LibraryExtension>(),
-
+                androidComponentsExtension = extensions.getByType<LibraryAndroidComponentsExtension>(),
-            androidExtension.buildTypes.configureEach {
+            )
-                enableAndroidTestCoverage = true
-                enableUnitTestCoverage = true
-            }
-
-            configureJacoco(extensions.getByType<LibraryAndroidComponentsExtension>())
         }
     }
 }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt

@@ -17,9 +17,12 @@
 package com.google.samples.apps.nowinandroid
 
 import com.android.build.api.artifact.ScopedArtifact
+import com.android.build.api.dsl.BuildType
+import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.ScopedArtifacts
 import com.android.build.api.variant.SourceDirectories
+import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.file.RegularFile
@@ -59,8 +62,14 @@ private fun String.capitalize() = replaceFirstChar {
  * tests on CI using a different Github Action or an external device farm.
  */
 internal fun Project.configureJacoco(
+    commonExtension: CommonExtension,
     androidComponentsExtension: AndroidComponentsExtension<*, *, *>,
 ) {
+    commonExtension.buildTypes.named("debug") {
+        enableAndroidTestCoverage = true
+        enableUnitTestCoverage = true
+    }
+
     configure<JacocoPluginExtension> {
         toolVersion = libs.findVersion("jacoco").get().toString()
     }