chore: dep updates and misc build changes

sureshg · sureshg · commit 29022cb79bc1 · 2024-06-26T16:00:02.000-07:00
diff --git a/backend/jvm/build.gradle.kts b/backend/jvm/build.gradle.kts
@@ -147,6 +147,8 @@ dependencies {
   implementation(projects.shared)
   implementation(projects.backend.data)
   implementation(projects.backend.profiling)
+  implementation(projects.backend.security)
+
   // Server dependencies
   implementation(libs.ktor.server.core)
   implementation(libs.ktor.server.netty)
diff --git a/backend/security/build.gradle.kts b/backend/security/build.gradle.kts
@@ -9,8 +9,6 @@ kotlin.sourceSets {
   commonMain { dependencies { implementation(projects.shared) } }
 
   jvmMain {
-    dependencies { implementation(libs.directory.keystore) }
-
     kotlin.srcDir("src/main/kotlin")
     resources.srcDir("src/main/resources")
   }
diff --git a/compose/desktop/src/wasmJsMain/resources/index.html b/compose/desktop/src/wasmJsMain/resources/index.html
@@ -5,11 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Kotlin Compose Web App</title>
     <script src="skiko.js"></script>
+    <script async defer src="wasm-app.js"></script>
 </head>
 <body>
 <div>
     <canvas id="ComposeTarget" width="800" height="600"></canvas>
 </div>
-<script src="wasm-app.js"></script>
 </body>
 </html>
diff --git a/gradle/build-logic/src/main/kotlin/common/MultiPlatformExtns.kt b/gradle/build-logic/src/main/kotlin/common/MultiPlatformExtns.kt
@@ -34,10 +34,11 @@ fun KotlinMultiplatformExtension.commonTarget() {
       dependencies {
         api(libs.kotlinx.coroutines.core)
         api(libs.kotlinx.datetime)
+        api(libs.kotlinx.io.core)
         api(libs.kotlinx.serialization.json)
+        api(libs.kotlinx.serialization.json.io)
         api(libs.kotlinx.collections.immutable)
         api(libs.kotlin.redacted.annotations)
-        api(libs.kotlinx.io.core)
         api(libs.kotlin.retry)
         api(libs.kotlin.logging)
         api(libs.kotlinx.html)
@@ -121,7 +122,7 @@ fun KotlinMultiplatformExtension.jvmTarget() {
         api(libs.kotlinx.coroutines.slf4j)
         api(libs.jspecify)
         api(libs.password4j)
-        api(libs.sslcontext.kickstart)
+        api(libs.bundles.keystore)
         // https://kotlinlang.org/docs/ksp-multiplatform.html
         api(libs.google.auto.annotations)
         ksp(libs.ksp.auto.service)
diff --git a/gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts b/gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts
@@ -205,12 +205,14 @@ dependencies {
   implementation(platform(libs.kotlin.wrappers.bom))
   implementation(kotlin("stdlib"))
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinx.io.core)
   implementation(libs.kotlinx.serialization.json)
+  implementation(libs.kotlinx.serialization.json.io)
   implementation(libs.kotlinx.datetime)
   implementation(libs.kotlin.redacted.annotations)
   implementation(libs.jspecify)
   implementation(libs.password4j)
-  implementation(libs.sslcontext.kickstart)
+  implementation(libs.bundles.keystore)
   implementation(libs.bundles.ajalt)
   // Auto-service
   ksp(libs.ksp.auto.service)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ kotlinx-io                     = "0.4.0"
 kotlinx-atomicfu               = "0.24.0"
 kotlinx-coroutines             = "1.8.1"
 kotlinx-datetime               = "0.6.0"
-kotlinx-serialization          = "1.7.0"
+kotlinx-serialization          = "1.7.1"
 kotlinx-rpc                    = "0.1.0"
 kotlinx-collections-immutable  = "0.3.7"
 kotlinx-lincheck               = "2.32"
@@ -35,7 +35,7 @@ kotlinx-metadata               = "0.9.0"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bcv                    = "0.15.0-Beta.2"
 kotlin-dokka                   = "1.9.20"
-kotlin-wrappers                = "1.0.0-pre.761"
+kotlin-wrappers                = "1.0.0-pre.763"
 kotlin-redacted                = "1.9.0"
 kotlinx-multik                 = "0.2.3"
 kotlinx-dataframe              = "0.13.1"
@@ -49,7 +49,7 @@ ktor-cohort                    = "2.5.1"
 otel                           = "1.39.0"
 otel-instr                     = "2.5.0"
 otel-alpha                     = "2.3.0-alpha"
-elastic-otel                   = "0.3.2"
+elastic-otel                   = "0.4.0"
 okio                           = "3.9.0"
 sslcontext-kickstart           = "8.3.6"
 ksp-auto-service               = "1.2.0"
@@ -66,12 +66,12 @@ jgit                           = "6.5.0.202303070854-r"
 jte                            = "3.1.12"
 jimfs                          = "1.3.0"
 sshj                           = "0.38.0"
-pty4j                          = "0.12.29"
+pty4j                          = "0.12.34"
 junit                          = "5.11.0-M2"
 koin                           = "3.5.6"
 kotest                         = "5.9.0"
 mockk                          = "1.13.11"
-mokkery                        = "2.1.0"
+mokkery                        = "2.1.1"
 slf4j                          = "2.1.0-alpha1"
 logback                        = "1.5.6"
 logback-tyler                  = "0.7"
@@ -89,7 +89,7 @@ rsocket                        = "0.16.0"
 jctools                        = "4.0.1"
 benasher44-uuid                = "0.8.4"
 kotlinx-uuid                   = "0.0.25"
-kotlin-codepoints              = "0.8.0"
+kotlin-codepoints              = "0.9.0"
 kotlin-logging                 = "7.0.0"
 kotlin-bignum                  = "0.3.9"
 kotlin-diff                    = "0.6.0"
@@ -108,7 +108,7 @@ java-keyring                   = "1.0.3"
 java-keychain                  = "1.1.0"
 webjars-xterm                  = "5.1.0"
 arrow-suspendapp               = "0.4.1-alpha.5"
-exposed                        = "0.51.1"
+exposed                        = "0.52.0"
 postgresql                     = "42.7.3"
 hikariCP                       = "5.1.0"
 h2                             = "2.2.220"
@@ -188,7 +188,7 @@ includegit-plugin              = "0.1.6"
 kmp-hierarchy                  = "1.1"
 jetbrains-compose              = "1.6.11"
 jetbrains-compose-nav          = "2.8.0-alpha02"
-kobweb                         = "0.18.1"
+kobweb                         = "0.18.2"
 detekt                         = "1.23.6"
 detekt-compose-rules           = "0.4.2"
 
@@ -263,6 +263,7 @@ kotlinx-coroutines-debug             = { module = "org.jetbrains.kotlinx:kotlinx
 kotlinx-serialization-bom            = { module = "org.jetbrains.kotlinx:kotlinx-serialization-bom"                 , version.ref = "kotlinx-serialization" }
 kotlinx-serialization-core           = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core"                , version.ref = "kotlinx-serialization"}
 kotlinx-serialization-json           = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json"                , version.ref = "kotlinx-serialization"}
+kotlinx-serialization-json-io        = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-io"             , version.ref = "kotlinx-serialization"}
 kotlinx-datetime                     = { module = "org.jetbrains.kotlinx:kotlinx-datetime"                          , version.ref = "kotlinx-datetime"}
 kotlinx-atomicfu                     = { module = "org.jetbrains.kotlinx:atomicfu"                                  , version.ref = "kotlinx-atomicfu"}
 kotlinx-io-core                      = { module = "org.jetbrains.kotlinx:kotlinx-io-core"                           , version.ref = "kotlinx-io"}
@@ -525,8 +526,8 @@ kfswatch                             = { module = "io.github.irgaly.kfswatch:kfs
 
 [bundles]
 ajalt = ["ajalt-mordant", "ajalt-mordant-coroutines", "ajalt-colormath", "ajalt-clikt"]
-ktor-server = []
-ktor-client = []
+keystore = ["sslcontext-kickstart", "directory-keystore"]
+
 
 [plugins]
 kotlin-powerassert                   = { id = "org.jetbrains.kotlin.plugin.power-assert"                       , version.ref = "kotlin"}
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -34,8 +34,6 @@ dependencies {
   // commonMainApi(libs.urlencoder)
   // commonMainApi(libs.arrow.suspendapp)
   // commonMainApi(libs.parsus)
-  // commonMainApi(libs.okio)
-  // commonTestApi(libs.okio.fakefilesystem)
   // jvmMainApi(libs.kotlin.reflect)
   // jvmMainApi(libs.logback.classic)
 }

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@ kotlin.sourceSets {`
`9`	`9`	`commonMain { dependencies { implementation(projects.shared) } }`
`10`	`10`
`11`	`11`	`jvmMain {`
`12`		`- dependencies { implementation(libs.directory.keystore) }`
`13`		`-`
`14`	`12`	`kotlin.srcDir("src/main/kotlin")`
`15`	`13`	`resources.srcDir("src/main/resources")`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ dependencies {`
`34`	`34`	`// commonMainApi(libs.urlencoder)`
`35`	`35`	`// commonMainApi(libs.arrow.suspendapp)`
`36`	`36`	`// commonMainApi(libs.parsus)`
`37`		`- // commonMainApi(libs.okio)`
`38`		`- // commonTestApi(libs.okio.fakefilesystem)`
`39`	`37`	`// jvmMainApi(libs.kotlin.reflect)`
`40`	`38`	`// jvmMainApi(libs.logback.classic)`
`41`	`39`	`}`