Remove use of Gson.

UstadMobile · Aug 11, 2024 · 9912ce1 · 9912ce1
1 parent 4f1807c
commit 9912ce1
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 455 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ plugins {
 
 
 group 'com.github.UstadMobile.door'
-version '0.79.15'
+version '0.79.17'
 
 ext.localProperties = new Properties()
 

diff --git a/door-compiler/build.gradle b/door-compiler/build.gradle
@@ -41,16 +41,14 @@ dependencies {
     implementation libs.kotlinpoet.metadata
     implementation libs.jsqlparser
     implementation libs.apache.commons.text
-    implementation libs.gson
     implementation libs.simple.jndi
     implementation libs.apache.commons.pool2
     implementation libs.sqlite.jdbc
     implementation libs.postgres.jdbc
     implementation libs.apache.commons.dbcp2
     implementation libs.ktor.server.netty
-    implementation libs.ktor.serialization.gson
     implementation libs.ktor.client.okhttp
-    implementation libs.ktor.client.gson
+    implementation libs.ktor.client.json
     implementation libs.nanohttpd
     implementation libs.nanohttpd.nanolets
     implementation libs.logback.classic

diff --git a/...r/src/main/kotlin/com/ustadmobile/lib/annotationprocessor/core/DoorHttpServerProcessor.kt b/...r/src/main/kotlin/com/ustadmobile/lib/annotationprocessor/core/DoorHttpServerProcessor.kt
diff --git a/door-runtime/build.gradle b/door-runtime/build.gradle
@@ -167,9 +167,7 @@ kotlin {
                 implementation libs.ktor.server.content.negotiation
                 implementation libs.ktor.client.content.negotiation
                 implementation libs.ktor.serialization.kotlinx.json
-                implementation libs.ktor.serialization.gson
                 implementation libs.ktor.client.okhttp
-                implementation libs.ktor.client.gson
                 implementation libs.ktor.server.test.host
                 implementation libs.turbine
             }

diff --git a/door-testdb-server/build.gradle b/door-testdb-server/build.gradle
@@ -47,7 +47,6 @@ dependencies {
     implementation libs.ktor.server.netty
     implementation libs.ktor.server.servlet
     implementation libs.ktor.server.content.negotiation
-    implementation libs.ktor.serialization.gson
     implementation libs.ktor.server.call.logging
     implementation libs.ktor.server.cors
 

diff --git a/door-testdb/build.gradle b/door-testdb/build.gradle
@@ -103,7 +103,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-                implementation libs.ktor.serialization.gson
                 implementation libs.kodein.di.framework.ktor.server
                 implementation libs.sqlite.jdbc
                 implementation libs.ktor.server.content.negotiation
@@ -119,7 +118,6 @@ kotlin {
                 implementation libs.mockwebserver
                 implementation libs.mockito.kotlin
                 implementation libs.ktor.client.okhttp
-                implementation libs.ktor.client.gson
                 implementation libs.ktor.serialization.kotlinx.json
                 implementation libs.simple.jndi
                 implementation libs.apache.commons.pool2
@@ -154,7 +152,6 @@ kotlin {
                 implementation libs.androidx.core.ktx
                 implementation libs.okhttp
                 implementation libs.okhttp.sse
-                implementation libs.gson
                 implementation libs.nanohttpd
                 implementation libs.nanohttpd.nanolets
             }

diff --git a/door-testdb/src/jvmTest/kotlin/com/ustadmobile/door/ktor/routes/ReplicationRouteTest.kt b/door-testdb/src/jvmTest/kotlin/com/ustadmobile/door/ktor/routes/ReplicationRouteTest.kt
@@ -26,7 +26,6 @@ import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.serialization.gson.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.config.*
 import io.ktor.server.engine.*
@@ -80,10 +79,10 @@ class ReplicationRouteTest {
 
             @Suppress("RemoveRedundantQualifierName", "RedundantSuppression") //Ensure clarity between client and server
             install(io.ktor.server.plugins.contentnegotiation.ContentNegotiation) {
-                gson {
-                    register(ContentType.Application.Json, GsonConverter())
-                    register(ContentType.Any, GsonConverter())
-                }
+                json(
+                    json = json,
+                    contentType = ContentType.Application.Json
+                )
             }
 
             routing {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,6 @@ androidx-core =  "1.12.0"
 kotlinpoet =  "1.14.2"
 jsqlparser =  "4.7"
 apache-commons-text =  "1.10.0"
-gson =  "2.10.1"
 simple-jndi =  "0.23.0"
 apache-commons-pool2 =  "2.12.0"
 postgres-jdbc =  "42.6.0"
@@ -60,18 +59,15 @@ kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin
 kotlinpoet-metadata = { module = "com.squareup:kotlinpoet-metadata", version.ref = "kotlinpoet"}
 jsqlparser = { module = "com.github.jsqlparser:jsqlparser", version.ref = "jsqlparser"}
 apache-commons-text = { module = "org.apache.commons:commons-text", version.ref = "apache-commons-text"}
-gson = { module = "com.google.code.gson:gson", version.ref = "gson"}
 simple-jndi = { module = "com.github.h-thurow:simple-jndi", version.ref = "simple-jndi"}
 apache-commons-pool2 = { module = "org.apache.commons:commons-pool2", version.ref = "apache-commons-pool2"}
 sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite-jdbc"}
 postgres-jdbc = { module = "org.postgresql:postgresql", version.ref = "postgres-jdbc"}
 apache-commons-dbcp2 = { module = "org.apache.commons:commons-dbcp2", version.ref = "apache-commons-dbcp2"}
 
 ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor"}
-ktor-serialization-gson = { module = "io.ktor:ktor-serialization-gson", version.ref = "ktor"}
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu"}
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor"}
-ktor-client-gson = { module = "io.ktor:ktor-client-gson", version.ref = "ktor"}
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor"}
 ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktor"}
 ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor"}

diff --git a/test-app-android/build.gradle b/test-app-android/build.gradle
@@ -71,10 +71,7 @@ dependencies {
     implementation libs.kotlinx.serialization.json
     implementation libs.kotlinx.atomicfu
 
-    implementation libs.ktor.serialization.gson
     implementation libs.ktor.client.okhttp
-    implementation libs.ktor.client.gson
-
 
     implementation libs.androidx.room.runtime
     implementation libs.androidx.room.ktx