Replace application and library plugins to merged one.

Change-Id: I757804fe0ea69ce0b1c33c0d0ac56b636f156c88
5 months ago · 5daf0dcc09
parent f80e8801ea
commit 5daf0dcc09
21 changed files with 39 additions and 51 deletions
--- a/app-nia-catalog/build.gradle.kts
+++ b/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 {
--- a/app/build.gradle.kts
+++ b/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")
--- a/build-logic/README.md
+++ b/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.library.compose`](convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt):
+- [`nowinandroid.android.compose`](convention/src/main/kotlin/AndroidComposeConventionPlugin.kt):
  Configures Jetpack Compose options
--- a/build-logic/convention/build.gradle.kts
+++ b/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") {
-            id = libs.plugins.nowinandroid.android.application.jacoco.get().pluginId
-            implementationClass = "AndroidApplicationJacocoConventionPlugin"
-        }
-        register("androidLibraryCompose") {
-            id = libs.plugins.nowinandroid.android.library.compose.get().pluginId
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
+        register("androidCompose") {
+            id = libs.plugins.nowinandroid.android.compose.get().pluginId
+            implementationClass = "AndroidComposeConventionPlugin"
        }
        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") {
-            id = libs.plugins.nowinandroid.android.library.jacoco.get().pluginId
-            implementationClass = "AndroidLibraryJacocoConventionPlugin"
+        register("androidJacoco") {
+            id = libs.plugins.nowinandroid.android.jacoco.get().pluginId
+            implementationClass = "AndroidJacocoConventionPlugin"
        }
        register("androidTest") {
            id = libs.plugins.nowinandroid.android.test.get().pluginId
--- a/core/analytics/build.gradle.kts
+++ b/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)
 }

--- a/core/data/build.gradle.kts
+++ b/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")
 }
--- a/core/database/build.gradle.kts
+++ b/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)
 }
--- a/core/datastore/build.gradle.kts
+++ b/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)
 }

--- a/core/designsystem/build.gradle.kts
+++ b/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)
 }

--- a/core/domain/build.gradle.kts
+++ b/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)
-}
+}
--- a/core/network/build.gradle.kts
+++ b/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.hilt)
    id("kotlinx-serialization")
    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
--- a/core/screenshot-testing/build.gradle.kts
+++ b/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)
 }

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

 android {
--- a/feature/bookmarks/build.gradle.kts
+++ b/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.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.compose)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }

 android {
--- a/feature/foryou/build.gradle.kts
+++ b/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.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.compose)
+    alias(libs.plugins.nowinandroid.android.jacoco)
    alias(libs.plugins.roborazzi)
 }

--- a/feature/interests/build.gradle.kts
+++ b/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.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.compose)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }
 android {
    namespace = "com.google.samples.apps.nowinandroid.feature.interests"
--- a/feature/search/build.gradle.kts
+++ b/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.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.compose)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }

 android {
@ -33,4 +33,3 @@ dependencies {
    androidTestImplementation(libs.bundles.androidx.compose.ui.test)
    androidTestImplementation(projects.core.testing)
 }
-
--- a/feature/settings/build.gradle.kts
+++ b/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.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.compose)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }

 android {
--- a/feature/topic/build.gradle.kts
+++ b/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.library.jacoco)
+    alias(libs.plugins.nowinandroid.android.compose)
+    alias(libs.plugins.nowinandroid.android.jacoco)
 }

 android {
@ -32,4 +32,4 @@ dependencies {

    androidTestImplementation(libs.bundles.androidx.compose.ui.test)
    androidTestImplementation(projects.core.testing)
-}
+}
--- a/gradle/libs.versions.toml
+++ b/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" }
--- a/sync/work/build.gradle.kts
+++ b/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)
 }