Skip to content

Commit 6bf37ad

Browse files
authored
Merge pull request #671 from android/kotlin-version-updates
Update Kotlin, Compose compiler, serialization versions
2 parents 3e66e3d + bea2eec commit 6bf37ad

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList
2222
import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
2323
import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
2424
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
25-
import kotlinx.serialization.ExperimentalSerializationApi
2625
import kotlinx.serialization.Serializable
2726
import kotlinx.serialization.json.Json
2827
import okhttp3.Call
@@ -81,7 +80,6 @@ class RetrofitNiaNetwork @Inject constructor(
8180
.baseUrl(NiaBaseUrl)
8281
.callFactory(okhttpCallFactory)
8382
.addConverterFactory(
84-
@OptIn(ExperimentalSerializationApi::class)
8583
networkJson.asConverterFactory("application/json".toMediaType()),
8684
)
8785
.build()

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ androidxActivity = "1.7.0"
66
androidxAppCompat = "1.5.1"
77
androidxBrowser = "1.4.0"
88
androidxComposeBom = "2023.01.00"
9-
androidxComposeCompiler = "1.4.1"
9+
androidxComposeCompiler = "1.4.4"
1010
androidxComposeMaterial3 = "1.1.0-alpha06"
1111
androidxComposeRuntimeTracing = "1.0.0-alpha01"
1212
androidxCore = "1.9.0"
@@ -37,17 +37,17 @@ hilt = "2.44.2"
3737
hiltExt = "1.0.0"
3838
jacoco = "0.8.7"
3939
junit4 = "4.13.2"
40-
kotlin = "1.8.0"
40+
kotlin = "1.8.10"
4141
kotlinxCoroutines = "1.6.4"
4242
kotlinxDatetime = "0.4.0"
43-
kotlinxSerializationJson = "1.4.1"
44-
ksp = "1.8.0-1.0.9"
43+
kotlinxSerializationJson = "1.5.0"
44+
ksp = "1.8.10-1.0.9"
4545
lint = "30.3.1"
4646
okhttp = "4.10.0"
4747
protobuf = "3.21.12"
4848
protobufPlugin = "0.8.19"
4949
retrofit = "2.9.0"
50-
retrofitKotlinxSerializationJson = "0.8.0"
50+
retrofitKotlinxSerializationJson = "1.0.0"
5151
room = "2.5.0"
5252
secrets = "2.0.1"
5353
turbine = "0.12.1"

0 commit comments

Comments
 (0)