diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9c9abebb..965f5fc6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,14 +3,13 @@ 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,18 +102,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } - kotlin { jvmToolchain(17) } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - splits { abi { isEnable = true @@ -188,7 +179,7 @@ dependencies { //glide: 사진 업로드 implementation(libs.glide) - kapt(libs.glide.compiler) + ksp(libs.glide.compiler) //coil: 이미지 로딩 implementation(libs.coil.compose) @@ -206,8 +197,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 +244,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 b28a406f..2e64d8ad 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 8749d23e..88ddcd2f 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 45f544d9..ae84df45 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" }