Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -188,7 +179,7 @@ dependencies {

//glide: 사진 업로드
implementation(libs.glide)
kapt(libs.glide.compiler)
ksp(libs.glide.compiler)

//coil: 이미지 로딩
implementation(libs.coil.compose)
Expand All @@ -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)
Expand Down Expand Up @@ -253,8 +244,4 @@ dependencies {
// PostHog
implementation(libs.posthog.android)

}

kapt {
correctErrorTypes = true
}
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions core/design-system/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down Expand Up @@ -29,10 +30,6 @@ android {
targetCompatibility = JavaVersion.VERSION_11
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.15"
}

kotlinOptions {
jvmTarget = "11"
}
Expand Down
8 changes: 5 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }