From 5daf0dcc09a3888baa72b02c3e1e16ff46ef2018 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 14 Apr 2025 14:49:16 +0900 Subject: [PATCH] Replace application and library plugins to merged one. Change-Id: I757804fe0ea69ce0b1c33c0d0ac56b636f156c88 --- app-nia-catalog/build.gradle.kts | 2 +- app/build.gradle.kts | 4 ++-- build-logic/README.md | 3 +-- build-logic/convention/build.gradle.kts | 22 +++++++--------------- core/analytics/build.gradle.kts | 2 +- core/data/build.gradle.kts | 2 +- core/database/build.gradle.kts | 2 +- core/datastore/build.gradle.kts | 2 +- core/designsystem/build.gradle.kts | 4 ++-- core/domain/build.gradle.kts | 4 ++-- core/network/build.gradle.kts | 2 +- core/screenshot-testing/build.gradle.kts | 2 +- core/ui/build.gradle.kts | 4 ++-- feature/bookmarks/build.gradle.kts | 4 ++-- feature/foryou/build.gradle.kts | 4 ++-- feature/interests/build.gradle.kts | 4 ++-- feature/search/build.gradle.kts | 5 ++--- feature/settings/build.gradle.kts | 4 ++-- feature/topic/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 6 ++---- sync/work/build.gradle.kts | 2 +- 21 files changed, 39 insertions(+), 51 deletions(-) diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts index 94d55b81c..84e6db6a8 100644 --- 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 { diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6aec2d1bc..14e49adea 100644 --- 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") diff --git a/build-logic/README.md b/build-logic/README.md index 0458b4fb1..2f0451054 100644 --- 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 diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 6d0237010..ce347cbe8 100644 --- 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 diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index 72f7620b0..64a00e408 100644 --- 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) } diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 8c839fa8e..ff2b83af5 100644 --- 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") } diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 8bab355b4..37b2f8aa2 100644 --- 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) } diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts index 0d4ba37c5..b5a2b26e8 100644 --- 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) } diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index aac2ddb8f..df000d1c2 100644 --- 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) } diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts index 191877459..da2881e94 100644 --- 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) -} \ No newline at end of file +} diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index d12482a56..fdb564753 100644 --- 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") diff --git a/core/screenshot-testing/build.gradle.kts b/core/screenshot-testing/build.gradle.kts index 57a43a200..612873f3c 100644 --- 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) } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 5606cb5d1..9c452fe62 100644 --- 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 { diff --git a/feature/bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.kts index 51a15ce7a..2f1c67321 100644 --- 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 { diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts index 59f6844cf..be3dea3da 100644 --- 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) } diff --git a/feature/interests/build.gradle.kts b/feature/interests/build.gradle.kts index 2b84b135f..0b3e5acf4 100644 --- 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" diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts index 5bb659c35..0129cbd69 100644 --- 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) } - diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 15d65204d..6e6517f16 100644 --- 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 { diff --git a/feature/topic/build.gradle.kts b/feature/topic/build.gradle.kts index bd8b59ec8..68a7b8d23 100644 --- 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) -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 477dde916..270642188 100644 --- 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" } diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.kts index 7b4b55a18..64d60e929 100644 --- 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) }