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

Apply version catalog in the `plugin`.

Browse Source 
Change-Id: I471d999ca3bd9c9246b24565d6e2f57bde010225
pull/1517/head
Jaehwa Noh 1 year ago
parent 2b00e021e2
commit b0388bbfc7
12 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File

5
build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
Unescape View File

@ -16,6 +16,7 @@
import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.dsl.ApplicationExtension
import com.google.samples.apps.nowinandroid.configureAndroidCompose import com.google.samples.apps.nowinandroid.configureAndroidCompose
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
@ -24,8 +25,8 @@ import org.gradle.kotlin.dsl.getByType
class AndroidApplicationComposeConventionPlugin : Plugin<Project> { class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
apply(plugin = "com.android.application") apply(plugin = libs.findPlugin("android-application").get().get().pluginId)
apply(plugin = "org.jetbrains.kotlin.plugin.compose") apply(plugin = libs.findPlugin("compose").get().get().pluginId)
val extension = extensions.getByType<ApplicationExtension>() val extension = extensions.getByType<ApplicationExtension>()
configureAndroidCompose(extension) configureAndroidCompose(extension)

10
build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
Unescape View File

@ -21,6 +21,7 @@ import com.google.samples.apps.nowinandroid.configureBadgingTasks
import com.google.samples.apps.nowinandroid.configureGradleManagedDevices import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
import com.google.samples.apps.nowinandroid.configureKotlinAndroid import com.google.samples.apps.nowinandroid.configureKotlinAndroid
import com.google.samples.apps.nowinandroid.configurePrintApksTask import com.google.samples.apps.nowinandroid.configurePrintApksTask
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
@ -30,10 +31,10 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("com.android.application") apply(libs.findPlugin("android-application").get().get().pluginId)
apply("org.jetbrains.kotlin.android") apply(libs.findPlugin("kotlin-android").get().get().pluginId)
apply("nowinandroid.android.lint") apply(libs.findPlugin("nowinandroid.android.lint").get().get().pluginId)
apply("com.dropbox.dependency-guard") apply(libs.findPlugin("dependencyGuard").get().get().pluginId)
} }
extensions.configure<ApplicationExtension> { extensions.configure<ApplicationExtension> {
@ -49,5 +50,4 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
} }
} }
} }
} }

6
build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
Unescape View File

@ -26,9 +26,9 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("com.google.gms.google-services") apply(libs.findPlugin("gms").get().get().pluginId)
apply("com.google.firebase.firebase-perf") apply(libs.findPlugin("firebase-perf").get().get().pluginId)
apply("com.google.firebase.crashlytics") apply(libs.findPlugin("firebase-crashlytics").get().get().pluginId)
} }
dependencies { dependencies {

3
build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
Unescape View File

@ -17,6 +17,7 @@
import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
import com.google.samples.apps.nowinandroid.configureJacoco import com.google.samples.apps.nowinandroid.configureJacoco
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.getByType
@ -24,7 +25,7 @@ import org.gradle.kotlin.dsl.getByType
class AndroidApplicationJacocoConventionPlugin : Plugin<Project> { class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
pluginManager.apply("jacoco") pluginManager.apply(libs.findPlugin("jacoco").get().get().pluginId)
val androidExtension = extensions.getByType<BaseAppModuleExtension>() val androidExtension = extensions.getByType<BaseAppModuleExtension>()
androidExtension.buildTypes.configureEach { androidExtension.buildTypes.configureEach {

4
build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
Unescape View File

@ -26,8 +26,8 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
pluginManager.apply { pluginManager.apply {
apply("nowinandroid.android.library") apply(libs.findPlugin("nowinandroid.android.library").get().get().pluginId)
apply("nowinandroid.android.hilt") apply(libs.findPlugin("nowinandroid.android.hilt").get().get().pluginId)
} }
extensions.configure<LibraryExtension> { extensions.configure<LibraryExtension> {
defaultConfig { defaultConfig {

4
build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt
Unescape View File

@ -23,8 +23,8 @@ class AndroidHiltConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("com.google.devtools.ksp") apply(libs.findPlugin("ksp").get().get().pluginId)
apply("dagger.hilt.android.plugin") apply(libs.findPlugin("hilt-plugin").get().get().pluginId)
} }
dependencies { dependencies {

5
build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
Unescape View File

@ -16,6 +16,7 @@
import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryExtension
import com.google.samples.apps.nowinandroid.configureAndroidCompose import com.google.samples.apps.nowinandroid.configureAndroidCompose
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
@ -24,8 +25,8 @@ import org.gradle.kotlin.dsl.getByType
class AndroidLibraryComposeConventionPlugin : Plugin<Project> { class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
apply(plugin = "com.android.library") apply(plugin = libs.findPlugin("android-library").get().get().pluginId)
apply(plugin = "org.jetbrains.kotlin.plugin.compose") apply(plugin = libs.findPlugin("compose").get().get().pluginId)
val extension = extensions.getByType<LibraryExtension>() val extension = extensions.getByType<LibraryExtension>()
configureAndroidCompose(extension) configureAndroidCompose(extension)

6
build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
Unescape View File

@ -32,9 +32,9 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("com.android.library") apply(libs.findPlugin("android-library").get().get().pluginId)
apply("org.jetbrains.kotlin.android") apply(libs.findPlugin("kotlin-android").get().get().pluginId)
apply("nowinandroid.android.lint") apply(libs.findPlugin("nowinandroid.android.lint").get().get().pluginId)
} }
extensions.configure<LibraryExtension> { extensions.configure<LibraryExtension> {

4
build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt
Unescape View File

@ -15,9 +15,9 @@
*/ */
import com.android.build.api.dsl.LibraryExtension import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.android.build.api.variant.LibraryAndroidComponentsExtension import com.android.build.api.variant.LibraryAndroidComponentsExtension
import com.google.samples.apps.nowinandroid.configureJacoco import com.google.samples.apps.nowinandroid.configureJacoco
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.getByType
@ -25,7 +25,7 @@ import org.gradle.kotlin.dsl.getByType
class AndroidLibraryJacocoConventionPlugin : Plugin<Project> { class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
pluginManager.apply("jacoco") pluginManager.apply(libs.findPlugin("jacoco").get().get().pluginId)
val androidExtension = extensions.getByType<LibraryExtension>() val androidExtension = extensions.getByType<LibraryExtension>()
androidExtension.buildTypes.configureEach { androidExtension.buildTypes.configureEach {

4
build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
Unescape View File

@ -26,8 +26,8 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
pluginManager.apply("androidx.room") pluginManager.apply(libs.findPlugin("room").get().get().pluginId)
pluginManager.apply("com.google.devtools.ksp") pluginManager.apply(libs.findPlugin("ksp").get().get().pluginId)
extensions.configure<KspExtension> { extensions.configure<KspExtension> {
arg("room.generateKotlin", "true") arg("room.generateKotlin", "true")

5
build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
Unescape View File

@ -17,6 +17,7 @@
import com.android.build.gradle.TestExtension import com.android.build.gradle.TestExtension
import com.google.samples.apps.nowinandroid.configureGradleManagedDevices import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
import com.google.samples.apps.nowinandroid.configureKotlinAndroid import com.google.samples.apps.nowinandroid.configureKotlinAndroid
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
@ -25,8 +26,8 @@ class AndroidTestConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("com.android.test") apply(libs.findPlugin("android-test").get().get().pluginId)
apply("org.jetbrains.kotlin.android") apply(libs.findPlugin("kotlin-android").get().get().pluginId)
} }
extensions.configure<TestExtension> { extensions.configure<TestExtension> {

5
build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
Unescape View File

@ -15,6 +15,7 @@
*/ */
import com.google.samples.apps.nowinandroid.configureKotlinJvm import com.google.samples.apps.nowinandroid.configureKotlinJvm
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
@ -22,8 +23,8 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("org.jetbrains.kotlin.jvm") apply(libs.findPlugin("kotlin-jvm").get().get().pluginId)
apply("nowinandroid.android.lint") apply(libs.findPlugin("nowinandroid.android.lint").get().get().pluginId)
} }
configureKotlinJvm() configureKotlinJvm()
} }

Write Preview
Loading…
Cancel
Save