Followed Kotlin DSL without type-safe accessors.

Jaehwa-Noh · Jaehwa-Noh · commit 18e35c27f67c · 2024-12-14T21:13:26.000+09:00
https://docs.gradle.org/current/userguide/kotlin_dsl.html#ex-configuring-plugins-without-type-safe-accessors Change-Id: Id711ad25146e291cbae40a5df4251f0ffef7b0a6
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
@@ -16,6 +16,7 @@
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
+import com.google.samples.apps.nowinandroid.implementation
 import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -34,9 +35,9 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
 
             dependencies {
                 val bom = libs.findLibrary("firebase-bom").get()
-                add("implementation", platform(bom))
-                "implementation"(libs.findLibrary("firebase.analytics").get())
-                "implementation"(libs.findLibrary("firebase.performance").get()) {
+                implementation(platform(bom))
+                implementation(libs.findLibrary("firebase.analytics").get())
+                implementation(libs.findLibrary("firebase.performance").get()) {
                     /*
                     Exclusion of protobuf / protolite dependencies is necessary as the
                     datastore-proto brings in protobuf dependencies. These are the source of truth
@@ -46,7 +47,7 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
                     exclude(group = "com.google.protobuf", module = "protobuf-javalite")
                     exclude(group = "com.google.firebase", module = "protolite-well-known-types")
                 }
-                "implementation"(libs.findLibrary("firebase.crashlytics").get())
+                implementation(libs.findLibrary("firebase.crashlytics").get())
             }
 
             extensions.configure<ApplicationExtension> {
diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -15,8 +15,11 @@
  */
 
 import com.android.build.gradle.LibraryExtension
+import com.google.samples.apps.nowinandroid.androidTestImplementation
 import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
+import com.google.samples.apps.nowinandroid.implementation
 import com.google.samples.apps.nowinandroid.libs
+import com.google.samples.apps.nowinandroid.testImplementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -36,18 +39,18 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
-                add("implementation", project(":core:ui"))
-                add("implementation", project(":core:designsystem"))
+                implementation(project(":core:ui"))
+                implementation(project(":core:designsystem"))
 
-                add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())
-                add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
-                add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
-                add("implementation", libs.findLibrary("androidx.navigation.compose").get())
-                add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
-                add("implementation", libs.findLibrary("kotlinx.serialization.json").get())
+                implementation(libs.findLibrary("androidx.hilt.navigation.compose").get())
+                implementation(libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
+                implementation(libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+                implementation(libs.findLibrary("androidx.navigation.compose").get())
+                implementation(libs.findLibrary("androidx.tracing.ktx").get())
+                implementation(libs.findLibrary("kotlinx.serialization.json").get())
 
-                add("testImplementation", libs.findLibrary("androidx.navigation.testing").get())
-                add("androidTestImplementation", libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
+                testImplementation(libs.findLibrary("androidx.navigation.testing").get())
+                androidTestImplementation(libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -16,12 +16,15 @@
 
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.LibraryExtension
+import com.google.samples.apps.nowinandroid.androidTestImplementation
 import com.google.samples.apps.nowinandroid.configureFlavors
 import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTests
+import com.google.samples.apps.nowinandroid.implementation
 import com.google.samples.apps.nowinandroid.libs
+import com.google.samples.apps.nowinandroid.testImplementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -53,10 +56,10 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 disableUnnecessaryAndroidTests(target)
             }
             dependencies {
-                add("androidTestImplementation", libs.findLibrary("kotlin.test").get())
-                add("testImplementation", libs.findLibrary("kotlin.test").get())
+                androidTestImplementation(libs.findLibrary("kotlin.test").get())
+                testImplementation(libs.findLibrary("kotlin.test").get())
 
-                add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
+                implementation(libs.findLibrary("androidx.tracing.ktx").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
@@ -16,6 +16,8 @@
 
 import androidx.room.gradle.RoomExtension
 import com.google.devtools.ksp.gradle.KspExtension
+import com.google.samples.apps.nowinandroid.implementation
+import com.google.samples.apps.nowinandroid.ksp
 import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -41,10 +43,10 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
-                add("implementation", libs.findLibrary("room.runtime").get())
-                add("implementation", libs.findLibrary("room.ktx").get())
-                add("ksp", libs.findLibrary("room.compiler").get())
+                implementation(libs.findLibrary("room.runtime").get())
+                implementation(libs.findLibrary("room.ktx").get())
+                ksp(libs.findLibrary("room.compiler").get())
             }
         }
     }
-}
+}
diff --git a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
@@ -15,6 +15,8 @@
  */
 
 import com.android.build.gradle.api.AndroidBasePlugin
+import com.google.samples.apps.nowinandroid.implementation
+import com.google.samples.apps.nowinandroid.ksp
 import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -25,21 +27,21 @@ class HiltConventionPlugin : Plugin<Project> {
         with(target) {
             pluginManager.apply("com.google.devtools.ksp")
             dependencies {
-                add("ksp", libs.findLibrary("hilt.compiler").get())
+                ksp(libs.findLibrary("hilt.compiler").get())
             }
 
             // Add support for Jvm Module, base on org.jetbrains.kotlin.jvm
             pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
                 dependencies {
-                    add("implementation", libs.findLibrary("hilt.core").get())
+                    implementation(libs.findLibrary("hilt.core").get())
                 }
             }
 
             /** Add support for Android modules, based on [AndroidBasePlugin] */
             pluginManager.withPlugin("com.android.base") {
                 pluginManager.apply("dagger.hilt.android.plugin")
                 dependencies {
-                    add("implementation", libs.findLibrary("hilt.android").get())
+                    implementation(libs.findLibrary("hilt.android").get())
                 }
             }
         }
diff --git a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
@@ -16,6 +16,7 @@
 
 import com.google.samples.apps.nowinandroid.configureKotlinJvm
 import com.google.samples.apps.nowinandroid.libs
+import com.google.samples.apps.nowinandroid.testImplementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -30,7 +31,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
             }
             configureKotlinJvm()
             dependencies {
-                add("testImplementation", libs.findLibrary("kotlin.test").get())
+                testImplementation(libs.findLibrary("kotlin.test").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@@ -37,10 +37,10 @@ internal fun Project.configureAndroidCompose(
 
         dependencies {
             val bom = libs.findLibrary("androidx-compose-bom").get()
-            add("implementation", platform(bom))
-            add("androidTestImplementation", platform(bom))
-            add("implementation", libs.findLibrary("androidx-compose-ui-tooling-preview").get())
-            add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get())
+            implementation(platform(bom))
+            androidTestImplementation(platform(bom))
+            implementation(libs.findLibrary("androidx-compose-ui-tooling-preview").get())
+            debugImplementation(libs.findLibrary("androidx-compose-ui-tooling").get())
         }
 
         testOptions {
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -54,7 +54,7 @@ internal fun Project.configureKotlinAndroid(
     configureKotlin<KotlinAndroidProjectExtension>()
 
     dependencies {
-        add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
+        coreLibraryDesugaring(libs.findLibrary("android.desugarJdkLibs").get())
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`import androidx.room.gradle.RoomExtension`
`18`	`18`	`import com.google.devtools.ksp.gradle.KspExtension`
	`19`	`+import com.google.samples.apps.nowinandroid.implementation`
	`20`	`+import com.google.samples.apps.nowinandroid.ksp`
`19`	`21`	`import com.google.samples.apps.nowinandroid.libs`
`20`	`22`	`import org.gradle.api.Plugin`
`21`	`23`	`import org.gradle.api.Project`
`@@ -41,10 +43,10 @@ class AndroidRoomConventionPlugin : Plugin<Project> {`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`dependencies {`
`44`		`- add("implementation", libs.findLibrary("room.runtime").get())`
`45`		`- add("implementation", libs.findLibrary("room.ktx").get())`
`46`		`- add("ksp", libs.findLibrary("room.compiler").get())`
	`46`	`+ implementation(libs.findLibrary("room.runtime").get())`
	`47`	`+ implementation(libs.findLibrary("room.ktx").get())`
	`48`	`+ ksp(libs.findLibrary("room.compiler").get())`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`}`
`50`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`import com.android.build.gradle.api.AndroidBasePlugin`
	`18`	`+import com.google.samples.apps.nowinandroid.implementation`
	`19`	`+import com.google.samples.apps.nowinandroid.ksp`
`18`	`20`	`import com.google.samples.apps.nowinandroid.libs`
`19`	`21`	`import org.gradle.api.Plugin`
`20`	`22`	`import org.gradle.api.Project`
`@@ -25,21 +27,21 @@ class HiltConventionPlugin : Plugin<Project> {`
`25`	`27`	`with(target) {`
`26`	`28`	`pluginManager.apply("com.google.devtools.ksp")`
`27`	`29`	`dependencies {`
`28`		`- add("ksp", libs.findLibrary("hilt.compiler").get())`
	`30`	`+ ksp(libs.findLibrary("hilt.compiler").get())`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`// Add support for Jvm Module, base on org.jetbrains.kotlin.jvm`
`32`	`34`	`pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {`
`33`	`35`	`dependencies {`
`34`		`- add("implementation", libs.findLibrary("hilt.core").get())`
	`36`	`+ implementation(libs.findLibrary("hilt.core").get())`
`35`	`37`	`}`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`/** Add support for Android modules, based on [AndroidBasePlugin] */`
`39`	`41`	`pluginManager.withPlugin("com.android.base") {`
`40`	`42`	`pluginManager.apply("dagger.hilt.android.plugin")`
`41`	`43`	`dependencies {`
`42`		`- add("implementation", libs.findLibrary("hilt.android").get())`
	`44`	`+ implementation(libs.findLibrary("hilt.android").get())`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`import com.google.samples.apps.nowinandroid.configureKotlinJvm`
`18`	`18`	`import com.google.samples.apps.nowinandroid.libs`
	`19`	`+import com.google.samples.apps.nowinandroid.testImplementation`
`19`	`20`	`import org.gradle.api.Plugin`
`20`	`21`	`import org.gradle.api.Project`
`21`	`22`	`import org.gradle.kotlin.dsl.dependencies`
`@@ -30,7 +31,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {`
`30`	`31`	`}`
`31`	`32`	`configureKotlinJvm()`
`32`	`33`	`dependencies {`
`33`		`- add("testImplementation", libs.findLibrary("kotlin.test").get())`
	`34`	`+ testImplementation(libs.findLibrary("kotlin.test").get())`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal fun Project.configureKotlinAndroid(`
`54`	`54`	`configureKotlin<KotlinAndroidProjectExtension>()`
`55`	`55`
`56`	`56`	`dependencies {`
`57`		`- add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())`
	`57`	`+ coreLibraryDesugaring(libs.findLibrary("android.desugarJdkLibs").get())`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`