From 32bfdde04e1226c0aab77a0647aeb24b7681dfe7 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 24 Jan 2021 23:47:54 +0530
Subject: [PATCH] Revert "all: switch to moshi-kotlin and fix tests"

This reverts commit da25dd2ed9bea50691b889e093ff896fea598b1a.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 api/build.gradle.kts                                         | 2 +-
 .../java/dev/msfjarvis/lobsters/injection/MoshiModule.kt     | 5 +----
 buildSrc/src/main/java/Dependencies.kt                       | 2 +-
 database/build.gradle.kts                                    | 3 ++-
 .../java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt    | 2 ++
 .../src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt  | 2 ++
 .../java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt    | 5 ++---
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 2f92c1c0..74a5a920 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -7,10 +7,10 @@ plugins {
 
 dependencies {
   kapt(Dependencies.AndroidX.Hilt.daggerCompiler)
+  kapt(Dependencies.ThirdParty.Moshi.codegen)
   api(Dependencies.ThirdParty.Retrofit.lib)
   implementation(project(":database"))
   implementation(Dependencies.AndroidX.Hilt.dagger)
-  implementation(Dependencies.ThirdParty.Moshi.kotlinReflect)
   implementation(Dependencies.ThirdParty.Retrofit.moshi)
   testImplementation(Dependencies.Kotlin.Coroutines.core)
   testImplementation(Dependencies.Testing.junit)
diff --git a/api/src/main/java/dev/msfjarvis/lobsters/injection/MoshiModule.kt b/api/src/main/java/dev/msfjarvis/lobsters/injection/MoshiModule.kt
index 5bddf329..075f5ff5 100644
--- a/api/src/main/java/dev/msfjarvis/lobsters/injection/MoshiModule.kt
+++ b/api/src/main/java/dev/msfjarvis/lobsters/injection/MoshiModule.kt
@@ -1,7 +1,6 @@
 package dev.msfjarvis.lobsters.injection
 
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -12,8 +11,6 @@ import dagger.hilt.components.SingletonComponent
 object MoshiModule {
   @Provides
   fun provideMoshi(): Moshi {
-    return Moshi.Builder()
-      .add(KotlinJsonAdapterFactory())
-      .build()
+    return Moshi.Builder().build()
   }
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 79133fe9..f05c4081 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -58,7 +58,7 @@ object Dependencies {
     object Moshi {
 
       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"
     }
 
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index f7a61b32..cba5e712 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -1,13 +1,14 @@
 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)
diff --git a/database/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt b/database/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt
index c1cc62ed..6002a693 100644
--- a/database/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt
+++ b/database/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt
@@ -1,7 +1,9 @@
 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,
diff --git a/database/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt b/database/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
index e76e3de1..d00de4a7 100644
--- a/database/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
+++ b/database/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
@@ -1,7 +1,9 @@
 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")
diff --git a/database/src/main/java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt b/database/src/main/java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt
index 2ec6793a..568d7d70 100644
--- a/database/src/main/java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt
+++ b/database/src/main/java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt
@@ -1,12 +1,11 @@
 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().add(KotlinJsonAdapterFactory()).build()
-  private val submitterJsonAdapter = moshi.adapter(Submitter::class.java)
+  private val moshi = Moshi.Builder().build()
+  private val submitterJsonAdapter = SubmitterJsonAdapter(moshi)
 
   override fun decode(databaseValue: String): Submitter {
     return submitterJsonAdapter.fromJson(databaseValue)!!