msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-17 23:47:02 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit da25dd2ed9bea50691b889e093ff896fea598b1a.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2021-01-24 23:47:54 +05:30
parent f9fcb089a1
commit 32bfdde04e
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
7 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/build.gradle.kts
View file

@ -7,10 +7,10 @@ plugins {
dependencies { dependencies {
kapt(Dependencies.AndroidX.Hilt.daggerCompiler) kapt(Dependencies.AndroidX.Hilt.daggerCompiler)
kapt(Dependencies.ThirdParty.Moshi.codegen)
api(Dependencies.ThirdParty.Retrofit.lib) api(Dependencies.ThirdParty.Retrofit.lib)
implementation(project(":database")) implementation(project(":database"))
implementation(Dependencies.AndroidX.Hilt.dagger) implementation(Dependencies.AndroidX.Hilt.dagger)
implementation(Dependencies.ThirdParty.Moshi.kotlinReflect)
implementation(Dependencies.ThirdParty.Retrofit.moshi) implementation(Dependencies.ThirdParty.Retrofit.moshi)
testImplementation(Dependencies.Kotlin.Coroutines.core) testImplementation(Dependencies.Kotlin.Coroutines.core)
testImplementation(Dependencies.Testing.junit) testImplementation(Dependencies.Testing.junit)

5
api/src/main/java/dev/msfjarvis/lobsters/injection/MoshiModule.kt
View file

@ -1,7 +1,6 @@
package dev.msfjarvis.lobsters.injection package dev.msfjarvis.lobsters.injection
import com.squareup.moshi.Moshi import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
@ -12,8 +11,6 @@ import dagger.hilt.components.SingletonComponent
object MoshiModule { object MoshiModule {
@Provides @Provides
fun provideMoshi(): Moshi { fun provideMoshi(): Moshi {
return Moshi.Builder() return Moshi.Builder().build()
.add(KotlinJsonAdapterFactory())
.build()
} }
} }

2
buildSrc/src/main/java/Dependencies.kt
View file

@ -58,7 +58,7 @@ object Dependencies {
object Moshi { object Moshi {
private const val version = "1.11.0" private const val version = "1.11.0"
const val kotlinReflect = "com.squareup.moshi:moshi-kotlin:$version" const val codegen = "com.squareup.moshi:moshi-kotlin-codegen:$version"
const val lib = "com.squareup.moshi:moshi:$version" const val lib = "com.squareup.moshi:moshi:$version"
} }

3
database/build.gradle.kts
View file

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

2
database/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt
View file

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

2
database/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
View file

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

5
database/src/main/java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt
View file

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