combine library.jacoco and application.jacoco into android.jacoco convention plugin

app/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
     alias(libs.plugins.nowinandroid.android.application)
     alias(libs.plugins.nowinandroid.android.application.compose)
     alias(libs.plugins.nowinandroid.android.application.flavors)
-    alias(libs.plugins.nowinandroid.android.application.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
     alias(libs.plugins.nowinandroid.android.application.firebase)
     id("com.google.android.gms.oss-licenses-plugin")

build-logic/convention/build.gradle.kts

@@ -62,10 +62,6 @@ gradlePlugin {
             id = "nowinandroid.android.application"
             implementationClass = "AndroidApplicationConventionPlugin"
         }
-        register("androidApplicationJacoco") {
-            id = "nowinandroid.android.application.jacoco"
-            implementationClass = "AndroidApplicationJacocoConventionPlugin"
-        }
         register("androidLibraryCompose") {
             id = "nowinandroid.android.library.compose"
             implementationClass = "AndroidLibraryComposeConventionPlugin"
@@ -78,9 +74,9 @@ gradlePlugin {
             id = "nowinandroid.android.feature"
             implementationClass = "AndroidFeatureConventionPlugin"
         }
-        register("androidLibraryJacoco") {
+        register("androidJacoco") {
-            id = "nowinandroid.android.library.jacoco"
+            id = "nowinandroid.android.jacoco"
-            implementationClass = "AndroidLibraryJacocoConventionPlugin"
+            implementationClass = "AndroidJacocoConventionPlugin"
         }
         register("androidTest") {
             id = "nowinandroid.android.test"

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

@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import com.google.samples.apps.nowinandroid.configureJacoco
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
-
-class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            pluginManager.apply("jacoco")
-            val androidExtension = extensions.getByType<BaseAppModuleExtension>()
-
-            androidExtension.buildTypes.configureEach {
-                enableAndroidTestCoverage = true
-                enableUnitTestCoverage = true
-            }
-
-            configureJacoco(extensions.getByType<ApplicationAndroidComponentsExtension>())
-        }
-    }
-}

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

@@ -17,23 +17,36 @@
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.google.samples.apps.nowinandroid.configureJacoco
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 
-class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
+class AndroidJacocoConventionPlugin: Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             pluginManager.apply("jacoco")
-            val androidExtension = extensions.getByType<LibraryExtension>()
 
-            androidExtension.buildTypes.configureEach {
+            plugins.withId("com.android.application") {
-                enableAndroidTestCoverage = true
+                val androidExtension = extensions.getByType<BaseAppModuleExtension>()
-                enableUnitTestCoverage = true
+                androidExtension.buildTypes.configureEach {
+                    enableAndroidTestCoverage = true
+                    enableUnitTestCoverage = true
+                }
+                configureJacoco(extensions.getByType<ApplicationAndroidComponentsExtension>())
             }
 
-            configureJacoco(extensions.getByType<LibraryAndroidComponentsExtension>())
+            plugins.withId("com.android.library") {
+                val androidExtension = extensions.getByType<LibraryExtension>()
+
+                androidExtension.buildTypes.configureEach {
+                    enableAndroidTestCoverage = true
+                    enableUnitTestCoverage = true
+                }
+
+                configureJacoco(extensions.getByType<LibraryAndroidComponentsExtension>())
+            }
         }
     }
 }

core/common/build.gradle.kts

@@ -15,7 +15,7 @@
  */
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
 }
 

core/data/build.gradle.kts

@@ -15,7 +15,7 @@
  */
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
     id("kotlinx-serialization")
 }

core/database/build.gradle.kts

@@ -16,7 +16,7 @@
 
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
     alias(libs.plugins.nowinandroid.android.room)
 }

core/datastore/build.gradle.kts

@@ -16,7 +16,7 @@
 
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
 }
 

core/designsystem/build.gradle.kts

@@ -16,7 +16,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.roborazzi)
 }
 

core/domain/build.gradle.kts

@@ -15,7 +15,7 @@
  */
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     id("com.google.devtools.ksp")
 }
 

core/network/build.gradle.kts

@@ -16,7 +16,7 @@
 
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
     id("kotlinx-serialization")
     id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")

core/ui/build.gradle.kts

@@ -16,7 +16,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {

feature/bookmarks/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {

feature/foryou/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.roborazzi)
 }
 

feature/interests/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.interests"

feature/search/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {

feature/settings/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {

feature/topic/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
     alias(libs.plugins.nowinandroid.android.library.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {

gradle/libs.versions.toml

@@ -175,12 +175,11 @@ nowinandroid-android-application = { id = "nowinandroid.android.application", ve
 nowinandroid-android-application-compose = { id = "nowinandroid.android.application.compose", version = "unspecified" }
 nowinandroid-android-application-firebase = { id = "nowinandroid.android.application.firebase", version = "unspecified" }
 nowinandroid-android-application-flavors = { id = "nowinandroid.android.application.flavors", version = "unspecified" }
-nowinandroid-android-application-jacoco = { id = "nowinandroid.android.application.jacoco", version = "unspecified" }
 nowinandroid-android-feature = { id = "nowinandroid.android.feature", version = "unspecified" }
 nowinandroid-android-hilt = { id = "nowinandroid.android.hilt", version = "unspecified" }
 nowinandroid-android-library = { id = "nowinandroid.android.library", version = "unspecified" }
 nowinandroid-android-library-compose = { id = "nowinandroid.android.library.compose", version = "unspecified" }
-nowinandroid-android-library-jacoco = { id = "nowinandroid.android.library.jacoco", version = "unspecified" }
+nowinandroid-android-jacoco = { id = "nowinandroid.android.jacoco", version = "unspecified" }
 nowinandroid-android-lint = { id = "nowinandroid.android.lint", version = "unspecified" }
 nowinandroid-android-room = { id = "nowinandroid.android.room", version = "unspecified" }
 nowinandroid-android-test = { id = "nowinandroid.android.test", version = "unspecified" }

sync/work/build.gradle.kts

@@ -15,7 +15,7 @@
  */
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
 }