From 6aed20f49b76f21b1d8451accf29dc0ca5b5a219 Mon Sep 17 00:00:00 2001 From: Sungyong An Date: Sun, 10 Dec 2023 16:53:07 +0900 Subject: [PATCH 1/4] Update libraries for retrofit --- app/dependencies/releaseRuntimeClasspath.txt | 2 +- gradle/libs.versions.toml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index 8a9f15f75..627eb21f8 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -173,7 +173,7 @@ com.google.firebase:firebase-perf:20.3.1 com.google.firebase:protolite-well-known-types:18.0.0 com.google.guava:listenablefuture:1.0 com.google.protobuf:protobuf-javalite:3.17.3 -com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0 +com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 com.kakao.sdk:v2-common:2.13.0 com.kakao.sdk:v2-network:2.13.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 25e98fc3a..108ab4890 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,6 +34,8 @@ photo = "1.0.0" # Etc coil = "2.2.2" dependencyGuard = "0.3.2" +retrofit = "2.9.0" +retrofit-serialization = "1.0.0" [libraries] @@ -145,8 +147,8 @@ firebase-perf = { module = "com.google.firebase:firebase-perf-ktx" } coil-runtime = { module = "io.coil-kt:coil", version.ref = "coil" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } -retrofit-runtime = "com.squareup.retrofit2:retrofit:2.9.0" -retrofit-serialization = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0" +retrofit-runtime = { module = "com.squareup.retrofit2:retrofit" , version.ref = "retrofit"} +retrofit-serialization = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter" , version.ref = "retrofit-serialization"} kakaoLink = "com.kakao.sdk:v2-share:2.13.0" naverMapCompose = { module = "io.github.fornewid:naver-map-compose", version.ref = "navermapcompose" } timber = "com.jakewharton.timber:timber:5.0.1" From 1e518ec4a1ddb4c69f99368105bd0e59f467a525 Mon Sep 17 00:00:00 2001 From: Sungyong An Date: Sun, 10 Dec 2023 17:22:13 +0900 Subject: [PATCH 2/4] Update libraries for kotlin, coroutines, ksp --- app/dependencies/releaseRuntimeClasspath.txt | 20 ++++++++++---------- gradle/libs.versions.toml | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index 627eb21f8..d8560424f 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -203,18 +203,18 @@ io.github.fornewid:photo-compose:1.0.0 javax.inject:javax.inject:1 org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.5.21 org.jetbrains.kotlin:kotlin-parcelize-runtime:1.5.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib:1.9.10 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 +org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.0 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.0 org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.0 org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.0 org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0 -org.jetbrains:annotations:20.1.0 +org.jetbrains:annotations:23.0.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 108ab4890..7d1245eb2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,10 +5,10 @@ androidGradlePlugin = "8.1.4" gms = "4.3.14" # Kotlin -kotlin = "1.8.10" -coroutines = "1.6.4" +kotlin = "1.9.10" +coroutines = "1.7.3" serialization = "1.5.0" -ksp = "1.8.10-1.0.9" +ksp = "1.9.10-1.0.13" # Dagger dagger = "2.45" @@ -23,7 +23,7 @@ work = "2.8.1" # Compose compose-bom = "2023.05.01" -composeCompiler = "1.4.4" +composeCompiler = "1.5.3" accompanist = "0.30.0" metronome = "0.5.2" navermapcompose = "1.3.3" From 346468f9dbcc4a75b6599af815bc2bf5702cf0da Mon Sep 17 00:00:00 2001 From: Sungyong An Date: Sun, 10 Dec 2023 17:33:53 +0900 Subject: [PATCH 3/4] Update libraries for hilt --- app/dependencies/releaseRuntimeClasspath.txt | 16 ++++++++-------- .../kotlin/soup/movie/buildlogic/Versions.kt | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index d8560424f..ab3ce7862 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -51,10 +51,10 @@ androidx.emoji2:emoji2:1.4.0-alpha01 androidx.exifinterface:exifinterface:1.3.3 androidx.fragment:fragment-ktx:1.5.6 androidx.fragment:fragment:1.5.6 -androidx.hilt:hilt-common:1.0.0 -androidx.hilt:hilt-navigation-compose:1.0.0 -androidx.hilt:hilt-navigation:1.0.0 -androidx.hilt:hilt-work:1.0.0 +androidx.hilt:hilt-common:1.1.0 +androidx.hilt:hilt-navigation-compose:1.1.0 +androidx.hilt:hilt-navigation:1.1.0 +androidx.hilt:hilt-work:1.1.0 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-ui:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.0 @@ -138,10 +138,10 @@ com.google.android.play:core-common:2.0.2 com.google.android.ump:user-messaging-platform:2.0.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.9 -com.google.dagger:dagger-lint-aar:2.45 -com.google.dagger:dagger:2.45 -com.google.dagger:hilt-android:2.45 -com.google.dagger:hilt-core:2.45 +com.google.dagger:dagger-lint-aar:2.48.1 +com.google.dagger:dagger:2.48.1 +com.google.dagger:hilt-android:2.48.1 +com.google.dagger:hilt-core:2.48.1 com.google.errorprone:error_prone_annotations:2.9.0 com.google.firebase:firebase-abt:21.1.0 com.google.firebase:firebase-analytics-ktx:21.2.0 diff --git a/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Versions.kt b/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Versions.kt index fe2f382b4..d2639f99e 100644 --- a/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Versions.kt +++ b/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Versions.kt @@ -2,6 +2,6 @@ package soup.movie.buildlogic object Versions { const val minSdk = 23 - const val compileSdk = 33 + const val compileSdk = 34 const val targetSdk = 33 } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d1245eb2..0a4de2bb4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,8 +11,8 @@ serialization = "1.5.0" ksp = "1.9.10-1.0.13" # Dagger -dagger = "2.45" -androidxhilt = "1.0.0" +dagger = "2.48.1" +androidxhilt = "1.1.0" # AndroidX activity = "1.6.1" From b716d349c5cb168cd7b764e302e3b85a06022e3c Mon Sep 17 00:00:00 2001 From: Sungyong An Date: Sun, 10 Dec 2023 17:41:41 +0900 Subject: [PATCH 4/4] Fix wrong gradle scan --- settings.gradle.kts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index abaac6d0b..5bffd687b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,7 +14,9 @@ dependencyResolutionManagement { content { includeGroupByRegex("com.android.*") includeGroupByRegex("androidx.*") - includeGroupByRegex("com.google.*") + includeGroupByRegex("com.google.android.*") + includeGroup("com.google.gms") + includeGroup("com.google.firebase") } } maven {