msb-public
/
nowinandroid
mirror of https://github.com/android/nowinandroid.git
1
0
Code Issues Projects Releases Wiki Activity

Replace application and library plugins to merged one.

Browse Source 
Change-Id: I757804fe0ea69ce0b1c33c0d0ac56b636f156c88
pull/1519/head
Jaehwa Noh 5 months ago
parent f80e8801ea
commit 5daf0dcc09
21 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
app-nia-catalog/build.gradle.kts
Unescape View File

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

4
app/build.gradle.kts
Unescape View File

@ -17,9 +17,9 @@ import com.google.samples.apps.nowinandroid.NiaBuildType
plugins { plugins {
alias(libs.plugins.nowinandroid.android.application) 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.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.android.application.firebase)
alias(libs.plugins.nowinandroid.hilt) alias(libs.plugins.nowinandroid.hilt)
id("com.google.android.gms.oss-licenses-plugin") id("com.google.android.gms.oss-licenses-plugin")

3
build-logic/README.md
Unescape View File

@ -33,6 +33,5 @@ Current list of convention plugins:
[`nowinandroid.android.library`](convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt), [`nowinandroid.android.library`](convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt),
[`nowinandroid.android.test`](convention/src/main/kotlin/AndroidTestConventionPlugin.kt): [`nowinandroid.android.test`](convention/src/main/kotlin/AndroidTestConventionPlugin.kt):
Configures common Android and Kotlin options. 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 Configures Jetpack Compose options

22
build-logic/convention/build.gradle.kts
Unescape View File

@ -58,33 +58,25 @@ tasks {
gradlePlugin { gradlePlugin {
plugins { plugins {
register("androidApplicationCompose") {
id = libs.plugins.nowinandroid.android.application.compose.get().pluginId
implementationClass = "AndroidApplicationComposeConventionPlugin"
}
register("androidApplication") { register("androidApplication") {
id = libs.plugins.nowinandroid.android.application.asProvider().get().pluginId id = libs.plugins.nowinandroid.android.application.asProvider().get().pluginId
implementationClass = "AndroidApplicationConventionPlugin" 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") { register("androidLibrary") {
id = libs.plugins.nowinandroid.android.library.asProvider().get().pluginId id = libs.plugins.nowinandroid.android.library.get().pluginId
implementationClass = "AndroidLibraryConventionPlugin" implementationClass = "AndroidLibraryConventionPlugin"
} }
register("androidFeature") { register("androidFeature") {
id = libs.plugins.nowinandroid.android.feature.get().pluginId id = libs.plugins.nowinandroid.android.feature.get().pluginId
implementationClass = "AndroidFeatureConventionPlugin" 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") { register("androidTest") {
id = libs.plugins.nowinandroid.android.test.get().pluginId id = libs.plugins.nowinandroid.android.test.get().pluginId

2
core/analytics/build.gradle.kts
Unescape View File

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

2
core/data/build.gradle.kts
Unescape View File

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

2
core/database/build.gradle.kts
Unescape View File

@ -16,7 +16,7 @@
plugins { plugins {
alias(libs.plugins.nowinandroid.android.library) 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.android.room)
alias(libs.plugins.nowinandroid.hilt) alias(libs.plugins.nowinandroid.hilt)
} }

2
core/datastore/build.gradle.kts
Unescape View File

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

4
core/designsystem/build.gradle.kts
Unescape View File

@ -15,8 +15,8 @@
*/ */
plugins { plugins {
alias(libs.plugins.nowinandroid.android.library) 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) alias(libs.plugins.roborazzi)
} }

4
core/domain/build.gradle.kts
Unescape View File

@ -15,7 +15,7 @@
*/ */
plugins { plugins {
alias(libs.plugins.nowinandroid.android.library) alias(libs.plugins.nowinandroid.android.library)
alias(libs.plugins.nowinandroid.android.library.jacoco) alias(libs.plugins.nowinandroid.android.jacoco)
id("com.google.devtools.ksp") id("com.google.devtools.ksp")
} }
@ -30,4 +30,4 @@ dependencies {
implementation(libs.javax.inject) implementation(libs.javax.inject)
testImplementation(projects.core.testing) testImplementation(projects.core.testing)
} }

2
core/network/build.gradle.kts
Unescape View File

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

2
core/screenshot-testing/build.gradle.kts
Unescape View File

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

4
core/ui/build.gradle.kts
Unescape View File

@ -15,8 +15,8 @@
*/ */
plugins { plugins {
alias(libs.plugins.nowinandroid.android.library) 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 { android {

4
feature/bookmarks/build.gradle.kts
Unescape View File

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

4
feature/foryou/build.gradle.kts
Unescape View File

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

4
feature/interests/build.gradle.kts
Unescape View File

@ -16,8 +16,8 @@
plugins { plugins {
alias(libs.plugins.nowinandroid.android.feature) 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 { android {
namespace = "com.google.samples.apps.nowinandroid.feature.interests" namespace = "com.google.samples.apps.nowinandroid.feature.interests"

5
feature/search/build.gradle.kts
Unescape View File

@ -16,8 +16,8 @@
plugins { plugins {
alias(libs.plugins.nowinandroid.android.feature) 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 { android {
@ -33,4 +33,3 @@ dependencies {
androidTestImplementation(libs.bundles.androidx.compose.ui.test) androidTestImplementation(libs.bundles.androidx.compose.ui.test)
androidTestImplementation(projects.core.testing) androidTestImplementation(projects.core.testing)
} }

4
feature/settings/build.gradle.kts
Unescape View File

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

6
feature/topic/build.gradle.kts
Unescape View File

@ -16,8 +16,8 @@
plugins { plugins {
alias(libs.plugins.nowinandroid.android.feature) 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 { android {
@ -32,4 +32,4 @@ dependencies {
androidTestImplementation(libs.bundles.androidx.compose.ui.test) androidTestImplementation(libs.bundles.androidx.compose.ui.test)
androidTestImplementation(projects.core.testing) androidTestImplementation(projects.core.testing)
} }

6
gradle/libs.versions.toml
Unescape View File

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

2
sync/work/build.gradle.kts
Unescape View File

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

Write Preview
Loading…
Cancel
Save