Skip to content

Commit f68a112

Browse files
authored
Merge pull request #307 from android/update-kotlinx-serialization-optin
Opt in to experimental kotlinx.serialization API locally
2 parents 14ae167 + 5fd5d17 commit f68a112

File tree

2 files changed

+5
-3
lines changed
  • build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid
  • core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit

2 files changed

+5
-3
lines changed

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ internal fun Project.configureKotlinAndroid(
5757
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
5858
"-opt-in=kotlinx.coroutines.FlowPreview",
5959
"-opt-in=kotlin.Experimental",
60-
// Enable experimental kotlinx serialization APIs
61-
"-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
6260
)
6361

6462
// Set JVM target to 1.8

core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
2525
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
2626
import javax.inject.Inject
2727
import javax.inject.Singleton
28+
import kotlinx.serialization.ExperimentalSerializationApi
2829
import kotlinx.serialization.Serializable
2930
import kotlinx.serialization.json.Json
3031
import okhttp3.MediaType.Companion.toMediaType
@@ -99,7 +100,10 @@ class RetrofitNiaNetwork @Inject constructor(
99100
)
100101
.build()
101102
)
102-
.addConverterFactory(networkJson.asConverterFactory("application/json".toMediaType()))
103+
.addConverterFactory(
104+
@OptIn(ExperimentalSerializationApi::class)
105+
networkJson.asConverterFactory("application/json".toMediaType())
106+
)
103107
.build()
104108
.create(RetrofitNiaNetworkApi::class.java)
105109

0 commit comments

Comments
 (0)