Merge pull request #307 from android/update-kotlinx-serialization-optin

Opt in to experimental kotlinx.serialization API locally
pull/313/head
Márton Braun 2 years ago committed by GitHub
commit f68a112cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -57,8 +57,6 @@ internal fun Project.configureKotlinAndroid(
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
"-opt-in=kotlinx.coroutines.FlowPreview", "-opt-in=kotlinx.coroutines.FlowPreview",
"-opt-in=kotlin.Experimental", "-opt-in=kotlin.Experimental",
// Enable experimental kotlinx serialization APIs
"-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
) )
// Set JVM target to 1.8 // Set JVM target to 1.8

@ -25,6 +25,7 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
@ -99,7 +100,10 @@ class RetrofitNiaNetwork @Inject constructor(
) )
.build() .build()
) )
.addConverterFactory(networkJson.asConverterFactory("application/json".toMediaType())) .addConverterFactory(
@OptIn(ExperimentalSerializationApi::class)
networkJson.asConverterFactory("application/json".toMediaType())
)
.build() .build()
.create(RetrofitNiaNetworkApi::class.java) .create(RetrofitNiaNetworkApi::class.java)

Loading…
Cancel
Save