From ae3ec5cdb971390b01de8111beb79ba80bd23e58 Mon Sep 17 00:00:00 2001 From: unam98 Date: Thu, 2 Apr 2026 21:54:20 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C=20?= =?UTF-8?q?=EB=B0=8F=20kapt=20=E2=86=92=20ksp=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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용으로만 유지 --- .gitignore | 1 + app/build.gradle | 18 +++++++++--------- build.gradle | 10 ++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 0 settings.gradle | 3 +++ 6 files changed, 20 insertions(+), 14 deletions(-) mode change 100644 => 100755 gradlew diff --git a/.gitignore b/.gitignore index 1be039695..3f9dbee21 100644 --- a/.gitignore +++ b/.gitignore @@ -169,3 +169,4 @@ fabric.properties #Login API KEY /app/src/main/res/values/kakao_strings.xml +gradle/gradle-daemon-jvm.properties diff --git a/app/build.gradle b/app/build.gradle index 3815c8e73..8129f499e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,10 +4,14 @@ plugins { id 'kotlin-parcelize' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0' + id 'org.jetbrains.kotlin.plugin.compose' id 'dagger.hilt.android.plugin' - // plugin for data binding, hilt + // plugin for ksp (Hilt, Glide) + id 'com.google.devtools.ksp' + + // plugin for data binding id 'kotlin-kapt' // plugin for hiding keys used in manifest @@ -66,10 +70,6 @@ android { buildConfig = true compose true } - composeOptions { - kotlinCompilerExtensionVersion '1.4.3' - } - buildTypes { release { minifyEnabled false @@ -128,10 +128,10 @@ dependencies { implementation("com.squareup.okhttp3:logging-interceptor") //hilt implementation "com.google.dagger:hilt-android:$hilt_version" - kapt "com.google.dagger:hilt-android-compiler:$hilt_version" + ksp "com.google.dagger:hilt-compiler:$hilt_version" // Glide - implementation "com.github.bumptech.glide:glide:4.12.0" - kapt "com.github.bumptech.glide:compiler:4.12.0" + implementation "com.github.bumptech.glide:glide:4.16.0" + ksp "com.github.bumptech.glide:ksp:4.16.0" //fragment change implementation("androidx.fragment:fragment-ktx:1.5.5") //coil diff --git a/build.gradle b/build.gradle index df178a34f..f421b7c89 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - hilt_version = '2.44.2' + hilt_version = '2.56.2' } repositories { @@ -16,7 +16,9 @@ buildscript { } plugins { - id 'com.android.application' version '8.1.3' apply false - id 'com.android.library' version '8.1.3' apply false - id 'org.jetbrains.kotlin.android' version '1.8.10' apply false + id 'com.android.application' version '8.13.2' apply false + id 'com.android.library' version '8.13.2' apply false + id 'org.jetbrains.kotlin.android' version '2.2.0' apply false + id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false + id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4af4b37c6..a061cede6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jan 22 18:11:59 KST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle index 30e356c3c..73c819f38 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,9 @@ pluginManagement { mavenCentral() } } +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0' +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { From 00d997980ee37f8ac4c478627c80abf470aeb542 Mon Sep 17 00:00:00 2001 From: unam98 Date: Thu, 2 Apr 2026 21:54:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CI=20workflow=20actions=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - actions/checkout v2 → v4 - actions/cache v2 제거, setup-java 내장 캐시 사용 - actions/setup-java v1 → v4 (temurin 배포판) --- .github/workflows/CI.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cc6a43a21..c1c158472 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,21 +18,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - name: Gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - name: set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: temurin + cache: gradle - name: Write compile time google-services.json file env: