From e1e195564ddf2e06c5aa0e29b13d4b37be4b7512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Braun?= Date: Thu, 29 Sep 2022 09:44:53 +0200 Subject: [PATCH] Opt in to experimental kotlinx.serialization API locally Change-Id: Ibc88151f5a8b7a3a82e2c0043839c1cb9e016bcf --- .../com/google/samples/apps/nowinandroid/KotlinAndroid.kt | 2 -- .../core/network/retrofit/RetrofitNiaNetwork.kt | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt index 4768c7346..984993b2b 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt @@ -57,8 +57,6 @@ internal fun Project.configureKotlinAndroid( "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-opt-in=kotlinx.coroutines.FlowPreview", "-opt-in=kotlin.Experimental", - // Enable experimental kotlinx serialization APIs - "-opt-in=kotlinx.serialization.ExperimentalSerializationApi" ) // Set JVM target to 1.8 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 351db55ed..c8b1be763 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 @@ -25,6 +25,7 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import javax.inject.Inject import javax.inject.Singleton +import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType @@ -99,7 +100,10 @@ class RetrofitNiaNetwork @Inject constructor( ) .build() ) - .addConverterFactory(networkJson.asConverterFactory("application/json".toMediaType())) + .addConverterFactory( + @OptIn(ExperimentalSerializationApi::class) + networkJson.asConverterFactory("application/json".toMediaType()) + ) .build() .create(RetrofitNiaNetworkApi::class.java)