From 5df32b079e6171895fcf57bd7647dbddac149aad Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Wed, 18 Dec 2024 21:42:59 +0900 Subject: [PATCH] Restore into a plain String text. Change-Id: I3f4ead0be88ed460de007dae7b53c4d2f6c2249b --- ...roidApplicationFirebaseConventionPlugin.kt | 9 ++++---- .../kotlin/AndroidFeatureConventionPlugin.kt | 23 ++++++++----------- .../kotlin/AndroidLibraryConventionPlugin.kt | 10 +++----- .../kotlin/AndroidRoomConventionPlugin.kt | 8 +++---- .../src/main/kotlin/HiltConventionPlugin.kt | 8 +++---- .../main/kotlin/JvmLibraryConventionPlugin.kt | 4 +--- .../apps/nowinandroid/AndroidCompose.kt | 8 +++---- .../apps/nowinandroid/KotlinAndroid.kt | 2 +- 8 files changed, 29 insertions(+), 43 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt index 9abc693a5..7aacc0ffe 100644 --- 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 { 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 { 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 { diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt index 03b8bc296..aa30f5115 100644 --- 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 { } 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 index 7e2a88b88..aadd2b13e 100644 --- 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 { override fun apply(target: Project) { @@ -56,10 +52,10 @@ class AndroidLibraryConventionPlugin : Plugin { 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 index 5ce0fc286..5a8d648f3 100644 --- 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 { } 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 index 304cd93ea..24d8c3382 100644 --- 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,13 +25,13 @@ class HiltConventionPlugin : Plugin { 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()) } } @@ -41,7 +39,7 @@ class HiltConventionPlugin : Plugin { 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 index 4739d434e..f9ae4a1c4 100644 --- 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 { override fun apply(target: Project) { @@ -31,7 +29,7 @@ class JvmLibraryConventionPlugin : Plugin { } 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 index 8189aee5c..81320a600 100644 --- 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 index cb97db6be..d1ae4eb36 100644 --- 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() dependencies { - coreLibraryDesugaring(libs.findLibrary("android.desugarJdkLibs").get()) + "coreLibraryDesugaring"(libs.findLibrary("android.desugarJdkLibs").get()) } }