chore: ktor client json serialization changes

Author: sureshg

common/build.gradle.kts

@@ -25,7 +25,8 @@ dependencies {
   commonMainImplementation(libs.kotlinx.io.core)
   commonMainImplementation(libs.ktor.client.core)
   commonMainImplementation(libs.ktor.client.logging)
-  commonMainImplementation(libs.ktor.client.serialization)
+  commonMainImplementation(libs.ktor.client.content.negotiation)
+  commonMainImplementation(libs.ktor.serialization.json)
   commonMainImplementation(libs.ktor.client.resources)
   commonMainImplementation(libs.ajalt.colormath)
   commonMainImplementation(libs.benasher44.uuid)

devtools/compiler/plugin/build.gradle.kts

@@ -6,5 +6,5 @@ plugins {
 dependencies {
   compileOnly(kotlin("compiler-embeddable"))
   testImplementation(kotlin("compiler-embeddable"))
-  testImplementation("com.github.tschuchortdev:kotlin-compile-testing:+")
+  // testImplementation("dev.zacsweers.kctfork:ksp:+")
 }

gradle.properties

@@ -1,10 +1,12 @@
 ## Gradle
+org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.daemon=false
 org.gradle.configureondemand=true
 org.gradle.configuration-cache=false
-org.gradle.jvmargs=-Xmx2048m
+# org.gradle.configuration-cache.problems=warn
+# org.gradle.configuration-cache.max-problems=5
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 # org.gradle.welcome=never
 # org.gradle.console=rich

gradle/build-logic/common-plugins/build.gradle.kts

@@ -93,9 +93,17 @@ dependencies {
   implementation(platform(libs.kotlin.bom))
   implementation(kotlin("stdlib"))
   implementation(libs.kotlinx.coroutines.core)
+  // Http client and JSON serialization
+  implementation(libs.ktor.client.java)
+  implementation(libs.ktor.client.content.negotiation)
+  implementation(libs.ktor.serialization.json)
+  implementation(libs.ktor.client.resources)
+  // Text styling
   implementation(libs.ajalt.mordant)
-  implementation(libs.jte.runtime)
+  // Exec Jar
   implementation(libs.build.zip.prefixer)
+  // Templating
+  implementation(libs.jte.runtime)
   // jteGenerate(libs.jte.models)
   // compileOnly(libs.jte.kotlin)
 
@@ -124,6 +132,7 @@ dependencies {
   implementation(libs.build.nativeimage.plugin)
   implementation(libs.build.modulegraph.plugin)
   implementation(libs.build.cash.molecule.plugin)
+  implementation(libs.build.npm.publish.plugin)
   testImplementation(gradleTestKit())
   // implementation(libs.build.mokkery.plugin)
   // implementation(libs.build.jte.plugin)

gradle/build-logic/common-plugins/src/main/kotlin/common/ServiceClient.kt

@@ -0,0 +1,40 @@
+package common
+
+import io.ktor.client.*
+import io.ktor.client.engine.java.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.plugins.resources.Resources
+import io.ktor.http.*
+import io.ktor.resources.*
+import io.ktor.serialization.kotlinx.json.*
+import kotlinx.serialization.json.Json
+
+@Resource("json") class JsonResource()
+
+object ServiceClient {
+  fun get() =
+      HttpClient(Java) {
+        install(Resources)
+        install(ContentNegotiation) {
+          json(
+              Json {
+                prettyPrint = true
+                isLenient = true
+                ignoreUnknownKeys = true
+              })
+        }
+        install(HttpTimeout) {
+          requestTimeoutMillis = 20_000
+          connectTimeoutMillis = 5_000
+          socketTimeoutMillis = 5_000
+        }
+        defaultRequest {
+          url {
+            protocol = URLProtocol.HTTPS
+            host = "app.dev"
+          }
+        }
+        engine { pipelining = true }
+      }
+}

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts

@@ -12,16 +12,18 @@ plugins {
   id("org.jetbrains.kotlinx.kover")
 }
 
-// Apply bincompat validation only to the root project.
+// Apply bin-compat validator plugin to the root project.
 if (project == rootProject) {
   apply(plugin = "org.jetbrains.kotlinx.binary-compatibility-validator")
 }
 
-// Configure bincompat validation only if the plugin is applied to the root project.
+// Configure bin-compat validator.
 plugins.withId("org.jetbrains.kotlinx.binary-compatibility-validator") {
   extensions.configure<ApiValidationExtension>("apiValidation") { validationDisabled = true }
 }
 
+// pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {}
+
 tasks {
   withType<DokkaTaskPartial>().configureEach {
     dokkaSourceSets.configureEach {

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.mpp.gradle.kts

@@ -20,6 +20,7 @@ plugins {
   id("dev.zacsweers.redacted")
   id("plugins.kotlin.docs")
   id("app.cash.molecule")
+  // id("dev.petuska.npm.publish")
   // id("dev.mokkery")
 }
 
@@ -70,6 +71,7 @@ kotlinMultiplatform.apply {
   js {
     useEsModules()
     binaries.executable()
+    // binaries.library()
 
     browser {
       commonWebpackConfig(
@@ -178,6 +180,8 @@ kotlinMultiplatform.apply {
       dependencies {
         implementation(kotlinw("browser"))
         // implementation(kotlinw("web"))
+        // kspDependency("CommonMainMetadata", project(":devtools:ksp:processor"))
+        // kspDependency("Js", project(":devtools:ksp:processor"))
       }
     }
     val jsTest by getting
@@ -225,7 +229,7 @@ tasks {
     val buildConfigExtn = extensions.create<BuildConfigExtension>("buildConfig")
     val buildConfig by register<BuildConfig>("buildConfig", buildConfigExtn)
     kotlinMultiplatform.sourceSets.named("${commonProjectName}Main") { kotlin.srcDirs(buildConfig) }
-    maybeRegister<Task>("prepareKotlinIdeaImport") { dependsOn(buildConfig) }
+    // maybeRegister<Task>("prepareKotlinIdeaImport") { dependsOn(buildConfig) }
   }
 
   // configure jvm target for ksp

gradle/build-logic/gradle.properties

@@ -1,10 +1,12 @@
 ## Gradle
+org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.daemon=false
 org.gradle.configureondemand=true
 org.gradle.configuration-cache=true
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.configuration-cache.problems=warn
+org.gradle.configuration-cache.max-problems=5
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
 ## Kotlin

gradle/libs.versions.toml

@@ -91,6 +91,7 @@ h2                             = "2.2.220"
 micrometer                     = "1.11.2"
 swagger-ui                     = "5.1.3"
 config4k                       = "0.6.0"
+apache-commons-imaging         = "1.0-alpha3"
 
 # NPM Dependencies
 npm-highlightjs                = "11.8.0"
@@ -120,6 +121,7 @@ modulegraph                    = "0.4.0"
 jetbrains-compose              = "1.5.0-dev1114"
 jetbrains-compose-compiler     = "1.5.0"
 cash-molecule                  = "1.1.0"
+npm-publish-plugin             = "3.4.0"
 
 
 [libraries]
@@ -160,7 +162,7 @@ build-modulegraph-plugin             = { module = "dev.iurysouza:modulegraph"
 build-jetbrains-compose-mpp          = { module = "org.jetbrains.compose:compose-gradle-plugin"                     , version.ref = "jetbrains-compose"}
 build-jetbrains-compose-runtime      = { module = "org.jetbrains.compose.runtime:runtime"                           , version.ref = "jetbrains-compose"}
 build-jetbrains-compose-compiler     = { module = "org.jetbrains.compose.compiler:compiler"                         , version.ref = "jetbrains-compose-compiler"}
-
+build-npm-publish-plugin             = { module = "dev.petuska:npm-publish-gradle-plugin"                           , version.ref = "npm-publish-plugin"}
 
 # Gradle Dependencies
 kotlin-bom                           = { module = "org.jetbrains.kotlin:kotlin-bom"                          , version.ref = "kotlin"}
@@ -206,6 +208,7 @@ ktor-server-default-headers          = { module = "io.ktor:ktor-server-default-h
 ktor-server-status-pages             = { module = "io.ktor:ktor-server-status-pages"                         , version.ref = "ktor"}
 ktor-server-auto-head                = { module = "io.ktor:ktor-server-auto-head-response"                   , version.ref = "ktor"}
 ktor-server-forwarded-header         = { module = "io.ktor:ktor-server-forwarded-header"                     , version.ref = "ktor"}
+
 ktor-serialization-json              = { module = "io.ktor:ktor-serialization-kotlinx-json"                  , version.ref = "ktor"}
 ktor-cohort-core                     = { module = "com.sksamuel.cohort:cohort-core"                          , version.ref = "ktor-cohort"}
 ktor-cohort-hikari                   = { module = "com.sksamuel.cohort:cohort-hikari"                        , version.ref = "ktor-cohort"}
@@ -215,8 +218,8 @@ ktor-client-cio                      = { module = "io.ktor:ktor-client-cio"
 ktor-client-java                     = { module = "io.ktor:ktor-client-java"                                 , version.ref = "ktor"}
 ktor-client-okhttp                   = { module = "io.ktor:ktor-client-okhttp"                               , version.ref = "ktor"}
 ktor-client-jetty                    = { module = "io.ktor:ktor-client-jetty"                                , version.ref = "ktor"}
-ktor-client-serialization            = { module = "io.ktor:ktor-client-serialization"                        , version.ref = "ktor"}
 ktor-client-websockets               = { module = "io.ktor:ktor-client-websockets"                           , version.ref = "ktor"}
+ktor-client-content-negotiation      = { module = "io.ktor:ktor-client-content-negotiation"                  , version.ref = "ktor"}
 ktor-client-auth                     = { module = "io.ktor:ktor-client-auth"                                 , version.ref = "ktor"}
 ktor-client-logging                  = { module = "io.ktor:ktor-client-logging"                              , version.ref = "ktor"}
 ktor-client-resources                = { module = "io.ktor:ktor-client-resources"                            , version.ref = "ktor"}
@@ -314,6 +317,8 @@ kotlin-wrappers-bom                  = { module = "org.jetbrains.kotlin-wrappers
 multiplatform-settings-core          = { module = "com.russhwolf:multiplatform-settings"                       , version.ref = "kmp-settings" }
 multiplatform-settings-coroutines    = { module = "com.russhwolf:multiplatform-settings-coroutines"            , version.ref = "kmp-settings" }
 
+apache-commons-imaging               = { module = "org.apache.commons:commons-imaging"                         , version.ref = "apache-commons-imaging" }
+
 [bundles]
 ktor-server = [
     "ktor-bom",
@@ -348,11 +353,12 @@ ktor-client = [
     "ktor-client-java",
     "ktor-client-okhttp",
     "ktor-client-jetty",
-    "ktor-client-serialization",
     "ktor-client-websockets",
+    "ktor-client-content-negotiation",
+    "ktor-serialization-json",
+    "ktor-client-resources",
     "ktor-client-auth",
-    "ktor-client-logging",
-    "ktor-client-resources"
+    "ktor-client-logging"
 ]
 
 [plugins]

settings.gradle.kts

@@ -24,4 +24,11 @@ include(":dep-mgmt:catalog")
 
 include(":devtools:ksp:processor")
 
-include(":devtools:compiler:plugin")
+include(
+    ":devtools:compiler:plugin")
+
+// includeBuild("misc/build") {
+//    dependencySubstitution {
+//        substitute(module("dev.suresh:misc-build")).using(project(":"))
+//    }
+// }