From 15a4b906caaa97bf6e70c93d4ea2e99abed5863a Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Fri, 2 Jan 2026 02:58:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20kapt=20->=20ksp=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98,=20compose=20comp?= =?UTF-8?q?iler=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 18 +++++------------- build.gradle.kts | 2 ++ core/design-system/build.gradle.kts | 5 +---- gradle/libs.versions.toml | 8 +++++--- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9c9abebb6..18e89bc61 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,14 +3,14 @@ import java.util.Properties plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) + alias(libs.plugins.compose.compiler) alias(libs.plugins.google.services) alias(libs.plugins.firebase.crashlytics) alias(libs.plugins.hilt.android) + alias(libs.plugins.ksp) id("kotlin-parcelize") id("kotlin-android") id("com.google.android.gms.oss-licenses-plugin") - id("kotlin-kapt") - } android { @@ -103,10 +103,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } - kotlin { jvmToolchain(17) } @@ -188,7 +184,7 @@ dependencies { //glide: 사진 업로드 implementation(libs.glide) - kapt(libs.glide.compiler) + ksp(libs.glide.compiler) //coil: 이미지 로딩 implementation(libs.coil.compose) @@ -206,8 +202,8 @@ dependencies { // Hilt for Dependency Injection implementation(libs.hilt.android) - kapt(libs.hilt.android.compiler) - kapt(libs.androidx.hilt.compiler) + ksp(libs.hilt.android.compiler) + ksp(libs.androidx.hilt.compiler) implementation(libs.androidx.hilt.common) implementation(libs.androidx.hilt.work) implementation(libs.hilt.navigation.compose) @@ -253,8 +249,4 @@ dependencies { // PostHog implementation(libs.posthog.android) -} - -kapt { - correctErrorTypes = true } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b28a406f7..2e64d8ad7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,11 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.google.services) apply false alias(libs.plugins.firebase.crashlytics) apply false alias(libs.plugins.hilt.android) apply false + alias(libs.plugins.ksp) apply false } buildscript { diff --git a/core/design-system/build.gradle.kts b/core/design-system/build.gradle.kts index 8749d23ed..88ddcd2ff 100644 --- a/core/design-system/build.gradle.kts +++ b/core/design-system/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) + alias(libs.plugins.compose.compiler) } android { @@ -29,10 +30,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } - kotlinOptions { jvmTarget = "11" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 45f544d9f..f4743d4e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,8 +51,8 @@ firebase-bom = "32.6.0" firebase-crashlytics = "2.9.9" google-services = "4.4.2" timber = "5.0.1" -kotlin-android = "1.9.25" -ksp = "1.9.0-1.0.13" +kotlin-android = "2.0.21" +ksp = "2.0.21-1.0.28" ossLicenses = "17.3.0" ossLicensesPlugin = "0.10.6" glanceAppwidget = "1.1.1" @@ -161,6 +161,8 @@ posthog-android = { group = "com.posthog", name = "posthog-android", version.ref android-application = { id = "com.android.application", version.ref = "android" } android-library = { id = "com.android.library", version.ref = "android" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-android" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-android" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" } -hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } \ No newline at end of file +hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file From 6b43f4c8d41c253df031334387395d273ba3f124 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Fri, 2 Jan 2026 03:19:16 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20id("kotlin-android"),=20kotlinO?= =?UTF-8?q?ptions=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 5 ----- gradle/libs.versions.toml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 18e89bc61..965f5fc66 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,7 +9,6 @@ plugins { alias(libs.plugins.hilt.android) alias(libs.plugins.ksp) id("kotlin-parcelize") - id("kotlin-android") id("com.google.android.gms.oss-licenses-plugin") } @@ -107,10 +106,6 @@ android { jvmToolchain(17) } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - splits { abi { isEnable = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f4743d4e1..ae84df45d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -165,4 +165,4 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = " google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" } hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }