A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update retrofit from 2.9.0 to 2.11.0
Simon Marquisdc144614901a
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 92f3f549b..4fc2ea36c 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -48,7 +48,7 @@ android {release {isMinifyEnabled = trueapplicationIdSuffix = NiaBuildType.RELEASE.applicationIdSuffix- proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))// To publish on the Play store a private signing key is required, but to allow anyone// who clones the code to sign and run the release variant, use the debug signing key.diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex e1c0a6f60..96f888117 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -190,12 +190,12 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guavacom.google.j2objc:j2objc-annotations:1.3com.google.protobuf:protobuf-javalite:4.26.1com.google.protobuf:protobuf-kotlin-lite:4.26.1-com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0+com.squareup.retrofit2:converter-kotlinx-serialization:2.11.0com.squareup.okhttp3:logging-interceptor:4.12.0com.squareup.okhttp3:okhttp:4.12.0com.squareup.okio:okio-jvm:3.9.0com.squareup.okio:okio:3.9.0-com.squareup.retrofit2:retrofit:2.9.0+com.squareup.retrofit2:retrofit:2.10.0io.coil-kt:coil-base:2.7.0io.coil-kt:coil-compose-base:2.7.0io.coil-kt:coil-compose:2.7.0diff --git a/app/proguard-rules.pro b/app/proguard-rules.prodeleted file mode 100644index 5f4922bce..000000000--- a/app/proguard-rules.pro+++ /dev/null@@ -1,9 +0,0 @@-# Fix for Retrofit issue https://github.com/square/retrofit/issues/3751-# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).--keep,allowobfuscation,allowshrinking interface retrofit2.Call--keep,allowobfuscation,allowshrinking class retrofit2.Response--# With R8 full mode generic signatures are stripped for classes that are not-# kept. Suspend functions are wrapped in continuations where the type argument-# is used.--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuationdiff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.ktindex e9fe99d9e..bdd852f8b 100644--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt@@ -22,12 +22,12 @@ import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeListimport com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactoryimport kotlinx.serialization.Serializableimport kotlinx.serialization.json.Jsonimport okhttp3.Callimport okhttp3.MediaType.Companion.toMediaTypeimport retrofit2.Retrofit+import retrofit2.converter.kotlinx.serialization.asConverterFactoryimport retrofit2.http.GETimport retrofit2.http.Queryimport javax.inject.Injectdiff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 128a4af05..062150292 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -48,7 +48,7 @@ moduleGraph = "2.5.0"okhttp = "4.12.0"protobuf = "4.26.1"protobufPlugin = "0.9.4"-retrofit = "2.9.0"+retrofit = "2.11.0"retrofitKotlinxSerializationJson = "1.0.0"robolectric = "4.12.2"roborazzi = "1.7.0"@@ -139,7 +139,7 @@ okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor",protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }-retrofit-kotlin-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerializationJson" }+retrofit-kotlin-serialization = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" }robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }