Restore into a plain String text.

Jaehwa-Noh · Jaehwa-Noh · commit cf2db95db0dc · 2024-12-18T21:42:59.000+09:00
Change-Id: I3f4ead0be88ed460de007dae7b53c4d2f6c2249b
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
@@ -16,7 +16,6 @@
 
 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
@@ -35,9 +34,9 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
 
             dependencies {
                 val bom = libs.findLibrary("firebase-bom").get()
-                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
@@ -47,7 +46,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,11 +15,8 @@
  */
 
 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
@@ -39,18 +36,18 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
-                implementation(project(":core:ui"))
-                implementation(project(":core:designsystem"))
+                "implementation"(project(":core:ui"))
+                "implementation"(project(":core:designsystem"))
 
-                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())
+                "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())
 
-                testImplementation(libs.findLibrary("androidx.navigation.testing").get())
-                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,20 +16,16 @@
 
 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
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin
 
 class AndroidLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -56,10 +52,10 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 disableUnnecessaryAndroidTests(target)
             }
             dependencies {
-                androidTestImplementation(libs.findLibrary("kotlin.test").get())
-                testImplementation(libs.findLibrary("kotlin.test").get())
+                "androidTestImplementation"(libs.findLibrary("kotlin.test").get())
+                "testImplementation"(libs.findLibrary("kotlin.test").get())
 
-                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,8 +16,6 @@
 
 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
@@ -43,9 +41,9 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
-                implementation(libs.findLibrary("room.runtime").get())
-                implementation(libs.findLibrary("room.ktx").get())
-                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,8 +15,6 @@
  */
 
 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
@@ -27,21 +25,21 @@ class HiltConventionPlugin : Plugin<Project> {
         with(target) {
             pluginManager.apply("com.google.devtools.ksp")
             dependencies {
-                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 {
-                    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 {
-                    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,11 +16,9 @@
 
 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
-import org.gradle.kotlin.dsl.kotlin
 
 class JvmLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -31,7 +29,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
             }
             configureKotlinJvm()
             dependencies {
-                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()
-            implementation(platform(bom))
-            androidTestImplementation(platform(bom))
-            implementation(libs.findLibrary("androidx-compose-ui-tooling-preview").get())
-            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 {
-        coreLibraryDesugaring(libs.findLibrary("android.desugarJdkLibs").get())
+        "coreLibraryDesugaring"(libs.findLibrary("android.desugarJdkLibs").get())
     }
 }
 

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