Revert "Revert "all: switch to moshi-kotlin and fix tests""

This reverts commit 602d11de35180d72fae9472b280d08af460d940f.
This commit is contained in:
Aditya Wasan 2021-01-25 02:17:45 +05:30 committed by Harsh Shandilya
parent c835a59cbf
commit 0a6371b159
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
7 changed files with 10 additions and 11 deletions

View file

@ -1,14 +1,13 @@
plugins {
id("com.android.library")
kotlin("android")
kotlin("kapt")
id("com.squareup.sqldelight")
`lobsters-plugin`
}
dependencies {
kapt(Dependencies.ThirdParty.Moshi.codegen)
implementation(Dependencies.ThirdParty.Moshi.lib)
implementation(Dependencies.ThirdParty.Moshi.kotlinReflect)
testImplementation(Dependencies.Kotlin.Coroutines.core)
testImplementation(Dependencies.ThirdParty.SQLDelight.jvmDriver)
testImplementation(Dependencies.Testing.junit)

View file

@ -1,9 +1,7 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
class KeybaseSignature(
@Json(name = "kb_username")
val kbUsername: String,

View file

@ -1,9 +1,7 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
class Submitter(
val username: String,
@Json(name = "created_at")

View file

@ -1,11 +1,12 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.squareup.sqldelight.ColumnAdapter
class SubmitterAdapter : ColumnAdapter<Submitter, String> {
private val moshi = Moshi.Builder().build()
private val submitterJsonAdapter = SubmitterJsonAdapter(moshi)
private val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
private val submitterJsonAdapter = moshi.adapter(Submitter::class.java)
override fun decode(databaseValue: String): Submitter {
return submitterJsonAdapter.fromJson(databaseValue)!!