Replace Moshi with kotlinx.serialization

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-11-07 11:15:54 +05:30
parent 43295a58eb
commit 84f45f523a
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
10 changed files with 40 additions and 52 deletions

View file

@ -4,6 +4,7 @@ plugins {
id("com.android.application")
kotlin("android")
kotlin("kapt")
kotlin("plugin.serialization") version "1.4.10"
id("dagger.hilt.android.plugin")
`lobsters-plugin`
`core-library-desugaring`
@ -90,9 +91,9 @@ dependencies {
implementation(Dependencies.ThirdParty.Roomigrant.runtime)
implementation(Dependencies.AndroidX.material)
implementation(Dependencies.AndroidX.Hilt.dagger)
implementation(Dependencies.ThirdParty.Moshi.lib)
implementation(Dependencies.ThirdParty.accompanist)
implementation(Dependencies.Kotlin.Coroutines.android)
implementation(Dependencies.Kotlin.Serialization.json)
implementation(Dependencies.ThirdParty.customtabs)
androidTestImplementation(Dependencies.Testing.daggerHilt)
testImplementation(Dependencies.Testing.junit)

View file

@ -1,24 +1,24 @@
package dev.msfjarvis.lobsters.data.source
import androidx.room.TypeConverter
import com.squareup.moshi.Moshi
import dev.msfjarvis.lobsters.model.Submitter
import dev.msfjarvis.lobsters.model.SubmitterJsonAdapter
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
object LobstersApiTypeConverters {
private val moshi = Moshi.Builder().build()
private const val SEPARATOR = ","
@TypeConverter
@JvmStatic
fun toSubmitterUser(value: String?): Submitter? {
return value?.let { SubmitterJsonAdapter(moshi).fromJson(value) }
return value?.let { Json.decodeFromString(value) }
}
@TypeConverter
@JvmStatic
fun fromSubmitterUser(value: Submitter?): String? {
return value?.let { SubmitterJsonAdapter(moshi).toJson(value) }
return value?.let { Json.encodeToString(value) }
}
@TypeConverter

View file

@ -136,7 +136,7 @@ fun PreviewLobstersItem() {
"sevan",
null,
null,
null,
emptyList(),
),
listOf("openbsd"),
)