From bea2eecd903ab44abc54c4abed67da910d71c025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Braun?= Date: Wed, 19 Apr 2023 10:15:08 +0200 Subject: [PATCH] Update Kotlin, Compose compiler, serialization versions Change-Id: I2aa0d07769e79e6f85824a391418566aef6b721e --- .../core/network/retrofit/RetrofitNiaNetwork.kt | 2 -- gradle/libs.versions.toml | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt index 9360d2cf1..7e9122ca8 100644 --- a/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt +++ b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt @@ -22,7 +22,6 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import okhttp3.Call @@ -81,7 +80,6 @@ class RetrofitNiaNetwork @Inject constructor( .baseUrl(NiaBaseUrl) .callFactory(okhttpCallFactory) .addConverterFactory( - @OptIn(ExperimentalSerializationApi::class) networkJson.asConverterFactory("application/json".toMediaType()), ) .build() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 677438412..4adf1e69b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidxActivity = "1.7.0" androidxAppCompat = "1.5.1" androidxBrowser = "1.4.0" androidxComposeBom = "2023.01.00" -androidxComposeCompiler = "1.4.1" +androidxComposeCompiler = "1.4.4" androidxComposeMaterial3 = "1.1.0-alpha06" androidxComposeRuntimeTracing = "1.0.0-alpha01" androidxCore = "1.9.0" @@ -37,17 +37,17 @@ hilt = "2.44.2" hiltExt = "1.0.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.8.0" +kotlin = "1.8.10" kotlinxCoroutines = "1.6.4" kotlinxDatetime = "0.4.0" -kotlinxSerializationJson = "1.4.1" -ksp = "1.8.0-1.0.9" +kotlinxSerializationJson = "1.5.0" +ksp = "1.8.10-1.0.9" lint = "30.3.1" okhttp = "4.10.0" protobuf = "3.21.12" protobufPlugin = "0.8.19" retrofit = "2.9.0" -retrofitKotlinxSerializationJson = "0.8.0" +retrofitKotlinxSerializationJson = "1.0.0" room = "2.5.0" secrets = "2.0.1" turbine = "0.12.1"