diff --git a/android/build.gradle.kts b/android/build.gradle.kts index a5d039a7..512506e5 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -45,7 +45,8 @@ dependencies { implementation(libs.coroutines.android) // Json - implementation(libs.serialization.json) + implementation(libs.serialization.json.core) + implementation(libs.serialization.json.okio) // Dependency Injection implementation(libs.kotlinInject.runtime) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index a788fd54..9d8d3790 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -41,7 +41,8 @@ kotlin { dependencies { api(kotlin("stdlib-common")) api(libs.coroutines.core) - api(libs.serialization.json) + api(libs.serialization.json.core) + api(libs.serialization.json.okio) api(libs.kotlinInject.runtime) api(libs.ktor.core) api(libs.ktor.contentNegotiation) diff --git a/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt index 39a36c57..ac9fb9b1 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt @@ -64,7 +64,7 @@ interface PreferenceStore { key: String, defaultValue: T, serializer: KSerializer, - serializersModule: SerializersModule = EmptySerializersModule + serializersModule: SerializersModule = EmptySerializersModule() ): Preference } diff --git a/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/StandardAdapters.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/StandardAdapters.kt index 362c73cb..44cc7c87 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/StandardAdapters.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/StandardAdapters.kt @@ -144,7 +144,7 @@ internal class ObjectAdapter( internal class JsonObjectAdapter( private val defaultValue: T, private val serializer: KSerializer, - private val serializersModule: SerializersModule = EmptySerializersModule + private val serializersModule: SerializersModule = EmptySerializersModule() ) : Adapter { override fun get(key: String, preferences: ObservableSettings): T { diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 0d9324ba..b1a0d4d7 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -38,7 +38,8 @@ kotlin { dependencies { api(kotlin("stdlib-common")) api(libs.coroutines.core) - api(libs.serialization.json) + api(libs.serialization.json.core) + api(libs.serialization.json.okio) api(libs.kotlinInject.runtime) api(libs.ktor.core) api(libs.ktor.websockets) diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 1c87aeb5..6f5c71ac 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -47,7 +47,8 @@ dependencies { implementation(libs.coroutines.swing) // Json - implementation(libs.serialization.json) + implementation(libs.serialization.json.core) + implementation(libs.serialization.json.okio) // Dependency Injection implementation(libs.kotlinInject.runtime) diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index ff9ae0b4..9993c374 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -39,7 +39,8 @@ kotlin { api(kotlin("stdlib-common")) api(kotlin("stdlib-common")) api(libs.coroutines.core) - api(libs.serialization.json) + api(libs.serialization.json.core) + api(libs.serialization.json.okio) api(libs.kotlinInject.runtime) api(libs.ktor.core) api(libs.ktor.contentNegotiation) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d45039e4..d7b4c4f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ kotlin = "1.7.0" coroutines = "1.6.4" # Serialization -json = "1.3.3" +json = "1.4.0" # Compose composeGradle = "1.2.0-alpha01-dev753" @@ -77,7 +77,8 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } # Serialization -serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "json" } +serialization-json-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "json" } +serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "json" } # Compose compose-animation = { module = "androidx.compose.animation:animation", version.ref = "composeAndroid" }