Skip to content

Commit

Permalink
[Dependency] Kotlin 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ajou4095 committed Aug 5, 2024
1 parent 6537fb2 commit f0bc8f5
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 49 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.iml
.gradle
.idea
.kotlin
build
local.properties
app/google-services.json
3 changes: 2 additions & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
.kotlin
22 changes: 12 additions & 10 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("dagger.hilt.android.plugin")
id("io.sentry.android.gradle")
id("com.google.devtools.ksp")
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
kotlin("android")
kotlin("kapt")
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.sentry)
alias(libs.plugins.gms)
alias(libs.plugins.firebase.crashlytics)
}

android {
Expand Down Expand Up @@ -65,8 +65,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
testFixtures {
enable = true
Expand Down
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@Suppress("DSL_SCOPE_VIOLATION") // Because of IDE bug https://youtrack.jetbrains.com/issue/KTIJ-19370
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.kotlin.jvm) apply false
alias(libs.plugins.kotlin.kapt) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.kotlin.parcelize) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.sentry) apply false
Expand Down
3 changes: 2 additions & 1 deletion common/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
.kotlin
1 change: 0 additions & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.kotlin.jvm)
}
Expand Down
3 changes: 2 additions & 1 deletion data/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
.kotlin
18 changes: 10 additions & 8 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.library")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp")
kotlin("android")
kotlin("kapt")
kotlin("plugin.serialization")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}

android {
Expand Down Expand Up @@ -42,8 +42,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
testFixtures {
enable = true
Expand Down
3 changes: 2 additions & 1 deletion domain/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
.kotlin
16 changes: 9 additions & 7 deletions domain/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.library")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp")
kotlin("android")
kotlin("kapt")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}

// TODO : Android 종속성 제거
Expand All @@ -30,8 +30,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
testFixtures {
enable = true
Expand Down
13 changes: 7 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ plugin-sentry = "4.5.1"
plugin-gms = "4.4.2"
plugin-firebase-crashlytics = "3.0.2"
# Kotlin
# TODO : Kotlin 2.0.0
kotlin = "1.9.23"
ksp = "1.9.23-1.0.19"
kotlin = "2.0.0"
ksp = "2.0.0-1.0.24"
coroutines = "1.8.1"
kotlinx-datetime = "0.5.0"
# Hilt
Expand All @@ -29,7 +28,6 @@ androidx-datastore = "1.1.1"
androidx-compose = "1.6.8"
androidx-compose-navigation = "2.7.7"
androidx-compose-lifecycle = "2.8.4"
androidx-compose-compiler = "1.5.13"
androidx-compose-material3 = "1.2.1"
androidx-compose-constraintlayout = "1.0.1"
androidx-test = "1.6.1"
Expand Down Expand Up @@ -70,6 +68,7 @@ hilt-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref =
# AndroidX Presentation
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidx-compose-material3" }
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
androidx-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-compose-navigation" }
Expand Down Expand Up @@ -125,6 +124,8 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
sentry = { id = "io.sentry.android.gradle", version.ref = "plugin-sentry" }
Expand All @@ -133,8 +134,8 @@ firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "

[bundles]
kotlin = ["kotlin", "kotlinx-coroutines-android", "kotlinx-coroutines-core", "kotlinx-datetime"]
androidx-presentation = ["androidx-core", "androidx-appcompat", "androidx-compose-material3",
"androidx-compose-navigation", "androidx-compose-constraintlayout",
androidx-presentation = ["androidx-core", "androidx-appcompat", "androidx-compose-ui",
"androidx-compose-material3", "androidx-compose-navigation", "androidx-compose-constraintlayout",
"androidx-compose-lifecycle", "holix-bottomsheet", "androidx-paging-compose"]
androidx-data = ["androidx-room-runtime", "androidx-room-coroutine", "androidx-paging-runtime",
"androidx-datastore-preferences"]
Expand Down
3 changes: 2 additions & 1 deletion presentation/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
.kotlin
27 changes: 16 additions & 11 deletions presentation/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.library")
id("com.google.devtools.ksp")
id("dagger.hilt.android.plugin")
kotlin("plugin.parcelize")
kotlin("android")
kotlin("kapt")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}

android {
Expand Down Expand Up @@ -36,21 +37,25 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
testFixtures {
enable = true
}
}

composeCompiler {
enableStrongSkippingMode = true
includeSourceInformation = true
}

dependencies {
implementation(project(":common"))
implementation(project(":domain"))
Expand Down

0 comments on commit f0bc8f5

Please sign in to comment.