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

@ -1,13 +1,10 @@
plugins {
id("com.android.library")
kotlin("android")
kotlin("kapt")
kotlin("plugin.serialization") version "1.4.10"
`lobsters-plugin`
}
dependencies {
kapt(Dependencies.ThirdParty.Moshi.codegen)
implementation(Dependencies.ThirdParty.Moshi.lib)
implementation(Dependencies.Kotlin.Serialization.json)
}

View file

@ -1,12 +1,12 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@JsonClass(generateAdapter = true)
@Serializable
class KeybaseSignature(
@Json(name = "kb_username")
@SerialName("kb_username")
val kbUsername: String,
@Json(name = "sig_hash")
@SerialName("sig_hash")
val sigHash: String
)

View file

@ -1,26 +1,26 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@JsonClass(generateAdapter = true)
@Serializable
class LobstersPost(
@Json(name = "short_id")
@SerialName("short_id")
val shortId: String,
@Json(name = "short_id_url")
@SerialName("short_id_url")
val shortIdUrl: String,
@Json(name = "created_at")
@SerialName("created_at")
val createdAt: String,
val title: String,
val url: String,
val score: Long,
val flags: Long,
@Json(name = "comment_count")
@SerialName("comment_count")
val commentCount: Long,
val description: String,
@Json(name = "comments_url")
@SerialName("comments_url")
val commentsUrl: String,
@Json(name = "submitter_user")
@SerialName("submitter_user")
val submitterUser: Submitter,
val tags: List<String>,
)

View file

@ -1,27 +1,27 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@JsonClass(generateAdapter = true)
@Serializable
class Submitter(
val username: String,
@Json(name = "created_at")
@SerialName("created_at")
val createdAt: String,
@Json(name = "is_admin")
@SerialName("is_admin")
val isAdmin: Boolean,
val about: String,
@Json(name = "is_moderator")
@SerialName("is_moderator")
val isModerator: Boolean,
val karma: Long = 0,
@Json(name = "avatar_url")
@SerialName("avatar_url")
val avatarUrl: String,
@Json(name = "invited_by_user")
@SerialName("invited_by_user")
val invitedByUser: String,
@Json(name = "github_username")
val githubUsername: String?,
@Json(name = "twitter_username")
val twitterUsername: String?,
@Json(name = "keybase_signatures")
val keybaseSignatures: List<KeybaseSignature>?
@SerialName("github_username")
val githubUsername: String? = null,
@SerialName("twitter_username")
val twitterUsername: String? = null,
@SerialName("keybase_signatures")
val keybaseSignatures: List<KeybaseSignature> = emptyList()
)