From 50f7439b531d7cce2beef44dc181f3318dce0f57 Mon Sep 17 00:00:00 2001 From: Sungyong An Date: Sat, 18 May 2024 22:36:01 +0900 Subject: [PATCH] Update libraries (#275) * Update jetpack libraries * Update to retrofit 2.11.0 * Update to kakao sdk 2.20.1 --- app/dependencies/releaseRuntimeClasspath.txt | 83 +++++++++++-------- .../java/soup/movie/ui/main/MainActivity.kt | 4 +- .../data/network/impl/di/NetworkModule.kt | 2 +- gradle/libs.versions.toml | 19 ++--- 4 files changed, 59 insertions(+), 49 deletions(-) diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index d4a6a3bf1..0a1c90653 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -1,15 +1,15 @@ -androidx.activity:activity-compose:1.8.2 -androidx.activity:activity-ktx:1.8.2 -androidx.activity:activity:1.8.2 -androidx.annotation:annotation-experimental:1.3.1 -androidx.annotation:annotation-jvm:1.7.1 -androidx.annotation:annotation:1.7.1 +androidx.activity:activity-compose:1.9.0 +androidx.activity:activity-ktx:1.9.0 +androidx.activity:activity:1.9.0 +androidx.annotation:annotation-experimental:1.4.0 +androidx.annotation:annotation-jvm:1.8.0 +androidx.annotation:annotation:1.8.0 androidx.appcompat:appcompat-resources:1.6.1 androidx.appcompat:appcompat:1.6.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 -androidx.browser:browser:1.7.0 +androidx.browser:browser:1.8.0 androidx.collection:collection-jvm:1.4.0 androidx.collection:collection-ktx:1.4.0 androidx.collection:collection:1.4.0 @@ -51,41 +51,52 @@ androidx.compose:compose-bom:2024.05.00 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-core:1.0.4 androidx.constraintlayout:constraintlayout:2.1.4 -androidx.core:core-ktx:1.12.0 -androidx.core:core:1.12.0 +androidx.core:core-ktx:1.13.1 +androidx.core:core:1.13.1 androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.0.0 -androidx.datastore:datastore-core:1.0.0 -androidx.datastore:datastore-preferences-core:1.0.0 -androidx.datastore:datastore-preferences:1.0.0 -androidx.datastore:datastore:1.0.0 +androidx.datastore:datastore-android:1.1.1 +androidx.datastore:datastore-core-android:1.1.1 +androidx.datastore:datastore-core-okio-jvm:1.1.1 +androidx.datastore:datastore-core-okio:1.1.1 +androidx.datastore:datastore-core:1.1.1 +androidx.datastore:datastore-preferences-android:1.1.1 +androidx.datastore:datastore-preferences-core-jvm:1.1.1 +androidx.datastore:datastore-preferences-core:1.1.1 +androidx.datastore:datastore-preferences:1.1.1 +androidx.datastore:datastore:1.1.1 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 androidx.emoji2:emoji2-views-helper:1.3.0 androidx.emoji2:emoji2:1.3.0 androidx.exifinterface:exifinterface:1.3.7 -androidx.fragment:fragment-ktx:1.6.2 -androidx.fragment:fragment:1.6.2 +androidx.fragment:fragment-ktx:1.7.1 +androidx.fragment:fragment:1.7.1 androidx.hilt:hilt-common:1.2.0 androidx.hilt:hilt-navigation-compose:1.2.0 androidx.hilt:hilt-navigation:1.2.0 androidx.hilt:hilt-work:1.2.0 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.7.0 -androidx.lifecycle:lifecycle-common:2.7.0 -androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 -androidx.lifecycle:lifecycle-livedata-core:2.7.0 -androidx.lifecycle:lifecycle-livedata:2.7.0 -androidx.lifecycle:lifecycle-process:2.7.0 -androidx.lifecycle:lifecycle-runtime-ktx:2.7.0 -androidx.lifecycle:lifecycle-runtime:2.7.0 -androidx.lifecycle:lifecycle-service:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 -androidx.lifecycle:lifecycle-viewmodel:2.7.0 +androidx.lifecycle:lifecycle-common-java8:2.8.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.0 +androidx.lifecycle:lifecycle-common:2.8.0 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0 +androidx.lifecycle:lifecycle-livedata-core:2.8.0 +androidx.lifecycle:lifecycle-livedata:2.8.0 +androidx.lifecycle:lifecycle-process:2.8.0 +androidx.lifecycle:lifecycle-runtime-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.0 +androidx.lifecycle:lifecycle-runtime:2.8.0 +androidx.lifecycle:lifecycle-service:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0 +androidx.lifecycle:lifecycle-viewmodel:2.8.0 androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.navigation:navigation-common-ktx:2.7.7 @@ -182,12 +193,11 @@ com.google.guava:guava:31.1-android com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.protobuf:protobuf-javalite:3.21.11 -com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 -com.kakao.sdk:v2-common:2.19.0 -com.kakao.sdk:v2-network:2.19.0 -com.kakao.sdk:v2-share:2.19.0 -com.kakao.sdk:v2-template:2.19.0 +com.kakao.sdk:v2-common:2.20.1 +com.kakao.sdk:v2-network:2.20.1 +com.kakao.sdk:v2-share:2.20.1 +com.kakao.sdk:v2-template:2.20.1 com.naver.maps:geometry:1.3.0 com.naver.maps:map-sdk:3.18.0 com.squareup.okhttp3:logging-interceptor:4.9.2 @@ -196,7 +206,8 @@ com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.8.0 com.squareup.okio:okio:3.8.0 com.squareup.retrofit2:converter-gson:2.9.0 -com.squareup.retrofit2:retrofit:2.9.0 +com.squareup.retrofit2:converter-kotlinx-serialization:2.11.0 +com.squareup.retrofit2:retrofit:2.11.0 com.webtoonscorp.android:readmore-foundation:1.5.6 com.webtoonscorp.android:readmore-material:1.5.6 dev.chrisbanes.snapper:snapper:0.2.2 @@ -211,8 +222,8 @@ io.github.fornewid:photo-compose:1.0.1 javax.inject:javax.inject:1 org.brotli:dec:0.1.2 org.checkerframework:checker-qual:3.12.0 -org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 -org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 +org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22 +org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24 diff --git a/app/src/main/java/soup/movie/ui/main/MainActivity.kt b/app/src/main/java/soup/movie/ui/main/MainActivity.kt index 283fa6cb6..ed8f33810 100644 --- a/app/src/main/java/soup/movie/ui/main/MainActivity.kt +++ b/app/src/main/java/soup/movie/ui/main/MainActivity.kt @@ -70,12 +70,12 @@ class MainActivity : AppCompatActivity() { viewModel.onInit() } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) handleDeepLink(intent) } - private fun handleDeepLink(intent: Intent?) { + private fun handleDeepLink(intent: Intent) { FirebaseLink.extractMovieId(intent) { movieId -> if (movieId != null) { viewModel.requestMovie(movieId) diff --git a/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt b/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt index 5d366d218..09fb24d4d 100644 --- a/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt +++ b/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt @@ -16,7 +16,6 @@ package soup.movie.data.network.impl.di import android.content.Context -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Binds import dagger.Module import dagger.Provides @@ -28,6 +27,7 @@ import okhttp3.Cache import okhttp3.MediaType import okhttp3.OkHttpClient import retrofit2.Retrofit +import retrofit2.converter.kotlinx.serialization.asConverterFactory import soup.movie.buildconfig.BuildConfig import soup.movie.data.network.RemoteDataSource import soup.movie.data.network.impl.MovieApiService diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d0831b671..2adee72c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,15 +14,15 @@ dagger = "2.51.1" androidxhilt = "1.2.0" # AndroidX -androidx-activity = "1.8.2" +androidx-activity = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.1" -androidx-browser = "1.7.0" +androidx-browser = "1.8.0" androidx-constraintlayout = "2.1.4" -androidx-core = "1.12.0" -androidx-datastore = "1.0.0" -androidx-fragment = "1.6.2" -androidx-lifecycle = "2.7.0" +androidx-core = "1.13.1" +androidx-datastore = "1.1.1" +androidx-fragment = "1.7.1" +androidx-lifecycle = "2.8.0" androidx-navigation = "2.7.7" androidx-profileinstaller = "1.3.1" androidx-room = "2.6.1" @@ -50,10 +50,9 @@ photo-compose = "1.0.1" # Etc coil = "2.6.0" dependencyGuard = "0.3.2" -retrofit = "2.9.0" -retrofit-serialization = "1.0.0" +retrofit = "2.11.0" timber = "5.0.1" -kakao = "2.19.0" +kakao = "2.20.1" [libraries] @@ -162,7 +161,7 @@ coil-runtime = { module = "io.coil-kt:coil", version.ref = "coil" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } -retrofit-serialization = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version.ref = "retrofit-serialization" } +retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" } kakao-share = { module = "com.kakao.sdk:v2-share", version.ref = "kakao" } timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }