Skip to content

Commit 4057ee4

Browse files
unam98claude
authored andcommitted
빌드 의존성 업그레이드 및 kapt → ksp 마이그레이션
- Gradle 8.0 → 8.13 - AGP 8.1.3 → 8.13.2 - Kotlin 1.8.10 → 2.2.0 - Compose Compiler: Kotlin 플러그인 내장 방식으로 전환 - Hilt 2.44.2 → 2.56.2 (ksp) - Glide 4.12.0 → 4.16.0 (ksp) - kapt는 DataBinding용으로만 유지 - CI workflow actions 버전 업그레이드 (checkout v4, setup-java v4) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 8691fef commit 4057ee4

7 files changed

Lines changed: 36 additions & 25 deletions

File tree

.github/workflows/CI.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222

23-
- name: Gradle cache
24-
uses: actions/cache@v2
25-
with:
26-
path: |
27-
~/.gradle/caches
28-
~/.gradle/wrapper
29-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
30-
restore-keys: |
31-
${{ runner.os }}-gradle-
3223
- name: set up JDK 17
33-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v4
3425
with:
3526
java-version: 17
27+
distribution: temurin
28+
cache: gradle
3629

3730
- name: Write compile time google-services.json file
3831
env:

app/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ plugins {
44

55
id 'kotlin-parcelize'
66

7-
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10'
7+
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0'
8+
id 'org.jetbrains.kotlin.plugin.compose'
89
id 'dagger.hilt.android.plugin'
910

10-
// plugin for data binding, hilt
11+
// plugin for ksp (Hilt, Glide)
12+
id 'com.google.devtools.ksp'
13+
14+
// plugin for data binding
1115
id 'kotlin-kapt'
1216

1317
// plugin for hiding keys used in manifest
@@ -66,10 +70,6 @@ android {
6670
buildConfig = true
6771
compose true
6872
}
69-
composeOptions {
70-
kotlinCompilerExtensionVersion '1.4.3'
71-
}
72-
7373
buildTypes {
7474
release {
7575
minifyEnabled false
@@ -128,10 +128,10 @@ dependencies {
128128
implementation("com.squareup.okhttp3:logging-interceptor")
129129
//hilt
130130
implementation "com.google.dagger:hilt-android:$hilt_version"
131-
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
131+
ksp "com.google.dagger:hilt-compiler:$hilt_version"
132132
// Glide
133-
implementation "com.github.bumptech.glide:glide:4.12.0"
134-
kapt "com.github.bumptech.glide:compiler:4.12.0"
133+
implementation "com.github.bumptech.glide:glide:4.16.0"
134+
ksp "com.github.bumptech.glide:ksp:4.16.0"
135135
//fragment change
136136
implementation("androidx.fragment:fragment-ktx:1.5.5")
137137
//coil

build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
ext {
4-
hilt_version = '2.44.2'
4+
hilt_version = '2.56.2'
55
}
66

77
repositories {
@@ -16,7 +16,9 @@ buildscript {
1616
}
1717

1818
plugins {
19-
id 'com.android.application' version '8.1.3' apply false
20-
id 'com.android.library' version '8.1.3' apply false
21-
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
19+
id 'com.android.application' version '8.13.2' apply false
20+
id 'com.android.library' version '8.13.2' apply false
21+
id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
22+
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false
23+
id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false
2224
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/04e088f8677de3b384108493cc9481d0/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e55dccbfe27cb97945148c61a39c89c5/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/dbd05c4936d573642f94cd149e1356c8/redirect
12+
toolchainVendor=JETBRAINS
13+
toolchainVersion=21
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Jan 22 18:11:59 KST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

gradlew

100644100755
File mode changed.

settings.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ pluginManagement {
55
mavenCentral()
66
}
77
}
8+
plugins {
9+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
10+
}
811
dependencyResolutionManagement {
912
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1013
repositories {

0 commit comments

Comments
 (0)