Merge cffa7dacdc into 8092c60c0f

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.application.firebase)
     alias(libs.plugins.nowinandroid.hilt)
     id("com.google.android.gms.oss-licenses-plugin")

build-logic/README.md

@@ -33,6 +33,5 @@ Current list of convention plugins:
   [`nowinandroid.android.library`](convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt),
   [`nowinandroid.android.test`](convention/src/main/kotlin/AndroidTestConventionPlugin.kt):
   Configures common Android and Kotlin options.
-- [`nowinandroid.android.application.compose`](convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt),
+- [`nowinandroid.android.compose`](convention/src/main/kotlin/AndroidComposeConventionPlugin.kt):
-  [`nowinandroid.android.library.compose`](convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt):
   Configures Jetpack Compose options

build-logic/convention/build.gradle.kts

@@ -58,33 +58,25 @@ tasks {
 
 gradlePlugin {
     plugins {
-        register("androidApplicationCompose") {
-            id = libs.plugins.nowinandroid.android.application.compose.get().pluginId
-            implementationClass = "AndroidApplicationComposeConventionPlugin"
-        }
         register("androidApplication") {
             id = libs.plugins.nowinandroid.android.application.asProvider().get().pluginId
             implementationClass = "AndroidApplicationConventionPlugin"
         }
-        register("androidApplicationJacoco") {
+        register("androidCompose") {
-            id = libs.plugins.nowinandroid.android.application.jacoco.get().pluginId
+            id = libs.plugins.nowinandroid.android.compose.get().pluginId
-            implementationClass = "AndroidApplicationJacocoConventionPlugin"
+            implementationClass = "AndroidComposeConventionPlugin"
-        }
-        register("androidLibraryCompose") {
-            id = libs.plugins.nowinandroid.android.library.compose.get().pluginId
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
         }
         register("androidLibrary") {
-            id = libs.plugins.nowinandroid.android.library.asProvider().get().pluginId
+            id = libs.plugins.nowinandroid.android.library.get().pluginId
             implementationClass = "AndroidLibraryConventionPlugin"
         }
         register("androidFeature") {
             id = libs.plugins.nowinandroid.android.feature.get().pluginId
             implementationClass = "AndroidFeatureConventionPlugin"
         }
-        register("androidLibraryJacoco") {
+        register("androidJacoco") {
-            id = libs.plugins.nowinandroid.android.library.jacoco.get().pluginId
+            id = libs.plugins.nowinandroid.android.jacoco.get().pluginId
-            implementationClass = "AndroidLibraryJacocoConventionPlugin"
+            implementationClass = "AndroidJacocoConventionPlugin"
         }
         register("androidTest") {
             id = libs.plugins.nowinandroid.android.test.get().pluginId

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

@@ -1,35 +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.dsl.ApplicationExtension
-import com.google.samples.apps.nowinandroid.configureAndroidCompose
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
-
-class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            apply(plugin = "com.android.application")
-            apply(plugin = "org.jetbrains.kotlin.plugin.compose")
-
-            val extension = extensions.getByType<ApplicationExtension>()
-            configureAndroidCompose(extension)
-        }
-    }
-
-}

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

@@ -1,40 +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.dsl.ApplicationExtension
-import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.google.samples.apps.nowinandroid.configureJacoco
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
-
-class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            apply(plugin = "jacoco")
-
-            val androidExtension = extensions.getByType<ApplicationExtension>()
-
-            androidExtension.buildTypes.configureEach {
-                enableAndroidTestCoverage = true
-                enableUnitTestCoverage = true
-            }
-
-            configureJacoco(extensions.getByType<ApplicationAndroidComponentsExtension>())
-        }
-    }
-}

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

@@ -0,0 +1,38 @@
+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.apply
+import org.gradle.kotlin.dsl.the
+
+/*
+ * Copyright 2025 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) {
+            apply(plugin = "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,60 @@
+import com.android.build.api.dsl.ApplicationExtension
+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.google.samples.apps.nowinandroid.configureJacoco
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.the
+
+/*
+ * Copyright 2025 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) {
+            apply(plugin = "jacoco")
+
+            val androidExtension: CommonExtension<*, *, *, *, *, *>
+            val jacocoExtension: AndroidComponentsExtension<*, *, *>
+
+            when {
+                pluginManager.hasPlugin("com.android.application") -> {
+                    androidExtension = the<ApplicationExtension>()
+                    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)
+        }
+    }
+}

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

@@ -1,35 +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.gradle.LibraryExtension
-import com.google.samples.apps.nowinandroid.configureAndroidCompose
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
-
-class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            apply(plugin = "com.android.library")
-            apply(plugin = "org.jetbrains.kotlin.plugin.compose")
-
-            val extension = extensions.getByType<LibraryExtension>()
-            configureAndroidCompose(extension)
-        }
-    }
-
-}

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

@@ -1,40 +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.dsl.LibraryExtension
-import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.google.samples.apps.nowinandroid.configureJacoco
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
-
-class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        with(target) {
-            apply(plugin = "jacoco")
-
-            val androidExtension = extensions.getByType<LibraryExtension>()
-
-            androidExtension.buildTypes.configureEach {
-                enableAndroidTestCoverage = true
-                enableUnitTestCoverage = true
-            }
-
-            configureJacoco(extensions.getByType<LibraryAndroidComponentsExtension>())
-        }
-    }
-}

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.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.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.room)
     alias(libs.plugins.nowinandroid.hilt)
 }

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.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.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

@@ -20,7 +20,7 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
     alias(libs.plugins.nowinandroid.hilt)
     id("kotlinx-serialization")
 }

core/screenshot-testing/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.hilt)
 }
 

core/ui/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.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {

feature/bookmarks/build.gradle.kts

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

feature/foryou/build.gradle.kts

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

feature/interests/build.gradle.kts

@@ -16,8 +16,8 @@
 
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
-    alias(libs.plugins.nowinandroid.android.library.compose)
+    alias(libs.plugins.nowinandroid.android.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

@@ -16,8 +16,8 @@
 
 plugins {
     alias(libs.plugins.nowinandroid.android.feature)
-    alias(libs.plugins.nowinandroid.android.library.compose)
+    alias(libs.plugins.nowinandroid.android.compose)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 
 android {
@@ -33,4 +33,3 @@ dependencies {
     androidTestImplementation(libs.bundles.androidx.compose.ui.test)
     androidTestImplementation(projects.core.testing)
 }
-

feature/settings/build.gradle.kts

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

feature/topic/build.gradle.kts

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

gradle/libs.versions.toml

@@ -185,14 +185,12 @@ secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugi
 
 # Plugins defined by this project
 nowinandroid-android-application = { id = "nowinandroid.android.application" }
-nowinandroid-android-application-compose = { id = "nowinandroid.android.application.compose" }
 nowinandroid-android-application-firebase = { id = "nowinandroid.android.application.firebase" }
 nowinandroid-android-application-flavors = { id = "nowinandroid.android.application.flavors" }
-nowinandroid-android-application-jacoco = { id = "nowinandroid.android.application.jacoco" }
+nowinandroid-android-compose = { id = "nowinandroid.android.compose" }
 nowinandroid-android-feature = { id = "nowinandroid.android.feature" }
+nowinandroid-android-jacoco = { id = "nowinandroid.android.jacoco" }
 nowinandroid-android-library = { id = "nowinandroid.android.library" }
-nowinandroid-android-library-compose = { id = "nowinandroid.android.library.compose" }
-nowinandroid-android-library-jacoco = { id = "nowinandroid.android.library.jacoco" }
 nowinandroid-android-lint = { id = "nowinandroid.android.lint" }
 nowinandroid-android-room = { id = "nowinandroid.android.room" }
 nowinandroid-android-test = { id = "nowinandroid.android.test" }

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.hilt)
 }