Merge pull request #1739 from Jaehwa-Noh/without-type-safe

dturner · web-flow · commit f66fd84f923a · 2024-12-19T12:34:01.000Z
Followed Kotlin DSL without type-safe accessors documentation
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
@@ -34,7 +34,7 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
 
             dependencies {
                 val bom = libs.findLibrary("firebase-bom").get()
-                add("implementation", platform(bom))
+                "implementation"(platform(bom))
                 "implementation"(libs.findLibrary("firebase.analytics").get())
                 "implementation"(libs.findLibrary("firebase.performance").get()) {
                     /*
diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -36,18 +36,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
@@ -26,7 +26,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin
 
 class AndroidLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -53,10 +52,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
@@ -41,10 +41,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
@@ -25,21 +25,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
@@ -19,7 +19,6 @@ import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin
 
 class JvmLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -30,7 +29,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
`@@ -26,7 +26,6 @@ import org.gradle.api.Plugin`
`26`	`26`	`import org.gradle.api.Project`
`27`	`27`	`import org.gradle.kotlin.dsl.configure`
`28`	`28`	`import org.gradle.kotlin.dsl.dependencies`
`29`		`-import org.gradle.kotlin.dsl.kotlin`
`30`	`29`
`31`	`30`	`class AndroidLibraryConventionPlugin : Plugin<Project> {`
`32`	`31`	`override fun apply(target: Project) {`
`@@ -53,10 +52,10 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {`
`53`	`52`	`disableUnnecessaryAndroidTests(target)`
`54`	`53`	`}`
`55`	`54`	`dependencies {`
`56`		`- add("androidTestImplementation", libs.findLibrary("kotlin.test").get())`
`57`		`- add("testImplementation", libs.findLibrary("kotlin.test").get())`
	`55`	`+ "androidTestImplementation"(libs.findLibrary("kotlin.test").get())`
	`56`	`+ "testImplementation"(libs.findLibrary("kotlin.test").get())`
`58`	`57`
`59`		`- add("implementation", libs.findLibrary("androidx.tracing.ktx").get())`
	`58`	`+ "implementation"(libs.findLibrary("androidx.tracing.ktx").get())`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ class AndroidRoomConventionPlugin : Plugin<Project> {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`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())`
	`44`	`+ "implementation"(libs.findLibrary("room.runtime").get())`
	`45`	`+ "implementation"(libs.findLibrary("room.ktx").get())`
	`46`	`+ "ksp"(libs.findLibrary("room.compiler").get())`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`
`50`		`-}`
	`50`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,21 +25,21 @@ class HiltConventionPlugin : Plugin<Project> {`
`25`	`25`	`with(target) {`
`26`	`26`	`pluginManager.apply("com.google.devtools.ksp")`
`27`	`27`	`dependencies {`
`28`		`- add("ksp", libs.findLibrary("hilt.compiler").get())`
	`28`	`+ "ksp"(libs.findLibrary("hilt.compiler").get())`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Add support for Jvm Module, base on org.jetbrains.kotlin.jvm`
`32`	`32`	`pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {`
`33`	`33`	`dependencies {`
`34`		`- add("implementation", libs.findLibrary("hilt.core").get())`
	`34`	`+ "implementation"(libs.findLibrary("hilt.core").get())`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/** Add support for Android modules, based on [AndroidBasePlugin] */`
`39`	`39`	`pluginManager.withPlugin("com.android.base") {`
`40`	`40`	`pluginManager.apply("dagger.hilt.android.plugin")`
`41`	`41`	`dependencies {`
`42`		`- add("implementation", libs.findLibrary("hilt.android").get())`
	`42`	`+ "implementation"(libs.findLibrary("hilt.android").get())`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import com.google.samples.apps.nowinandroid.libs`
`19`	`19`	`import org.gradle.api.Plugin`
`20`	`20`	`import org.gradle.api.Project`
`21`	`21`	`import org.gradle.kotlin.dsl.dependencies`
`22`		`-import org.gradle.kotlin.dsl.kotlin`
`23`	`22`
`24`	`23`	`class JvmLibraryConventionPlugin : Plugin<Project> {`
`25`	`24`	`override fun apply(target: Project) {`
`@@ -30,7 +29,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {`
`30`	`29`	`}`
`31`	`30`	`configureKotlinJvm()`
`32`	`31`	`dependencies {`
`33`		`- add("testImplementation", libs.findLibrary("kotlin.test").get())`
	`32`	`+ "testImplementation"(libs.findLibrary("kotlin.test").get())`
`34`	`33`	`}`
`35`	`34`	`}`
`36`	`35`	`}`
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`