mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-22 04:22:32 +01:00
Code Issues Projects Releases Wiki Activity

Update Json and add okio support

Browse Source
This commit is contained in:
Syer10
2022-08-23 12:34:54 -04:00
parent dd8cafe0ee
commit 0693838a5a
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/build.gradle.kts
View File

@@ -45,7 +45,8 @@ dependencies {
implementation(libs.coroutines.android) implementation(libs.coroutines.android)
// Json // Json
implementation(libs.serialization.json) implementation(libs.serialization.json.core)
implementation(libs.serialization.json.okio)
// Dependency Injection // Dependency Injection
implementation(libs.kotlinInject.runtime) implementation(libs.kotlinInject.runtime)

3
core/build.gradle.kts
View File

@@ -41,7 +41,8 @@ kotlin {
dependencies { dependencies {
api(kotlin("stdlib-common")) api(kotlin("stdlib-common"))
api(libs.coroutines.core) api(libs.coroutines.core)
api(libs.serialization.json) api(libs.serialization.json.core)
api(libs.serialization.json.okio)
api(libs.kotlinInject.runtime) api(libs.kotlinInject.runtime)
api(libs.ktor.core) api(libs.ktor.core)
api(libs.ktor.contentNegotiation) api(libs.ktor.contentNegotiation)

2
core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt
View File

@@ -64,7 +64,7 @@ interface PreferenceStore {
key: String, key: String,
defaultValue: T, defaultValue: T,
serializer: KSerializer<T>, serializer: KSerializer<T>,
serializersModule: SerializersModule = EmptySerializersModule serializersModule: SerializersModule = EmptySerializersModule()
): Preference<T> ): Preference<T>
} }

2
core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/StandardAdapters.kt
View File

@@ -144,7 +144,7 @@ internal class ObjectAdapter<T>(
internal class JsonObjectAdapter<T>( internal class JsonObjectAdapter<T>(
private val defaultValue: T, private val defaultValue: T,
private val serializer: KSerializer<T>, private val serializer: KSerializer<T>,
private val serializersModule: SerializersModule = EmptySerializersModule private val serializersModule: SerializersModule = EmptySerializersModule()
) : Adapter<T> { ) : Adapter<T> {
override fun get(key: String, preferences: ObservableSettings): T { override fun get(key: String, preferences: ObservableSettings): T {

3
data/build.gradle.kts
View File

@@ -38,7 +38,8 @@ kotlin {
dependencies { dependencies {
api(kotlin("stdlib-common")) api(kotlin("stdlib-common"))
api(libs.coroutines.core) api(libs.coroutines.core)
api(libs.serialization.json) api(libs.serialization.json.core)
api(libs.serialization.json.okio)
api(libs.kotlinInject.runtime) api(libs.kotlinInject.runtime)
api(libs.ktor.core) api(libs.ktor.core)
api(libs.ktor.websockets) api(libs.ktor.websockets)

3
desktop/build.gradle.kts
View File

@@ -47,7 +47,8 @@ dependencies {
implementation(libs.coroutines.swing) implementation(libs.coroutines.swing)
// Json // Json
implementation(libs.serialization.json) implementation(libs.serialization.json.core)
implementation(libs.serialization.json.okio)
// Dependency Injection // Dependency Injection
implementation(libs.kotlinInject.runtime) implementation(libs.kotlinInject.runtime)

3
domain/build.gradle.kts
View File

@@ -39,7 +39,8 @@ kotlin {
api(kotlin("stdlib-common")) api(kotlin("stdlib-common"))
api(kotlin("stdlib-common")) api(kotlin("stdlib-common"))
api(libs.coroutines.core) api(libs.coroutines.core)
api(libs.serialization.json) api(libs.serialization.json.core)
api(libs.serialization.json.okio)
api(libs.kotlinInject.runtime) api(libs.kotlinInject.runtime)
api(libs.ktor.core) api(libs.ktor.core)
api(libs.ktor.contentNegotiation) api(libs.ktor.contentNegotiation)

5
gradle/libs.versions.toml
View File

@@ -4,7 +4,7 @@ kotlin = "1.7.0"
coroutines = "1.6.4" coroutines = "1.6.4"
# Serialization # Serialization
json = "1.3.3" json = "1.4.0"
# Compose # Compose
composeGradle = "1.2.0-alpha01-dev753" 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" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
# Serialization # 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
compose-animation = { module = "androidx.compose.animation:animation", version.ref = "composeAndroid" } compose-animation = { module = "androidx.compose.animation:animation", version.ref = "composeAndroid" }