Merge android and library plugins

app-nia-catalog/build.gradle.kts

@@ -33,7 +33,7 @@ import com.google.samples.apps.nowinandroid.NiaFlavor
  */
 plugins {
     alias(libs.plugins.nowinandroid.android.application)
-    alias(libs.plugins.nowinandroid.android.application.compose)
+    alias(libs.plugins.nowinandroid.android.compose)
 }
 
 android {

app/build.gradle.kts

@@ -17,9 +17,9 @@ import com.google.samples.apps.nowinandroid.NiaBuildType
 
 plugins {
     alias(libs.plugins.nowinandroid.android.application)
-    alias(libs.plugins.nowinandroid.android.application.compose)
+    alias(libs.plugins.nowinandroid.android.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

@@ -15,7 +15,6 @@
  */
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `kotlin-dsl`
@@ -57,21 +56,17 @@ tasks {
 
 gradlePlugin {
     plugins {
-        register("androidApplicationCompose") {
-            id = "nowinandroid.android.application.compose"
-            implementationClass = "AndroidApplicationComposeConventionPlugin"
+        register("androidCompose") {
+            id = "nowinandroid.android.compose"
+            implementationClass = "AndroidComposeConventionPlugin"
         }
         register("androidApplication") {
             id = "nowinandroid.android.application"
             implementationClass = "AndroidApplicationConventionPlugin"
         }
-        register("androidApplicationJacoco") {
-            id = "nowinandroid.android.application.jacoco"
-            implementationClass = "AndroidApplicationJacocoConventionPlugin"
-        }
-        register("androidLibraryCompose") {
-            id = "nowinandroid.android.library.compose"
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
+        register("androidJacoco") {
+            id = "nowinandroid.android.jacoco"
+            implementationClass = "AndroidJacocoConventionPlugin"
         }
         register("androidLibrary") {
             id = "nowinandroid.android.library"
@@ -81,10 +76,6 @@ gradlePlugin {
             id = "nowinandroid.android.feature"
             implementationClass = "AndroidFeatureConventionPlugin"
         }
-        register("androidLibraryJacoco") {
-            id = "nowinandroid.android.library.jacoco"
-            implementationClass = "AndroidLibraryJacocoConventionPlugin"
-        }
         register("androidTest") {
             id = "nowinandroid.android.test"
             implementationClass = "AndroidTestConventionPlugin"

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

@@ -0,0 +1,37 @@
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.LibraryExtension
+import com.google.samples.apps.nowinandroid.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.the
+
+/*
+ * Copyright 2024 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.
+ */
+
+class AndroidComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
+            val extension: CommonExtension<*, *, *, *, *, *> = when {
+                pluginManager.hasPlugin("com.android.application") -> the<ApplicationExtension>()
+                pluginManager.hasPlugin("com.android.library") -> the<LibraryExtension>()
+                else -> TODO("This plugin is dependent on either nowinandroid.android.application or nowinandroid.android.library. Apply one of those plugins first.")
+            }
+            configureAndroidCompose(extension)
+        }
+    }
+}

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

@@ -0,0 +1,57 @@
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.variant.AndroidComponentsExtension
+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.the
+
+/*
+ * Copyright 2024 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.
+ */
+
+class AndroidJacocoConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("jacoco")
+
+            val androidExtension: CommonExtension<*, *, *, *, *, *>
+            val jacocoExtension: AndroidComponentsExtension<*, *, *>
+
+            when {
+                pluginManager.hasPlugin("com.android.application") -> {
+                    androidExtension = the<BaseAppModuleExtension>()
+                    jacocoExtension = the<ApplicationAndroidComponentsExtension>()
+                }
+                pluginManager.hasPlugin("com.android.library") -> {
+                    androidExtension = the<LibraryExtension>()
+                    jacocoExtension = the<LibraryAndroidComponentsExtension>()
+                }
+                else ->
+                    TODO("This plugin is dependent on either nowinandroid.android.application or nowinandroid.android.library. Apply one of those plugins first.")
+            }
+
+            androidExtension.buildTypes.configureEach {
+                enableAndroidTestCoverage = true
+                enableUnitTestCoverage = true
+            }
+
+            configureJacoco(jacocoExtension)
+        }
+    }
+}

core/analytics/build.gradle.kts

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

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)
 }
 
@@ -26,4 +26,4 @@ android {
 dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.turbine)
-}
+}

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

@@ -15,8 +15,8 @@
  */
 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.compose)
+    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")
 }
 
@@ -30,4 +30,4 @@ dependencies {
     implementation(libs.javax.inject)
 
     testImplementation(projects.core.testing)
-}
+}