chore: web refactorings

Author: sureshg

gradle/libs.versions.toml

@@ -38,20 +38,20 @@ kotlinx-fuzz                   = "0.2.2"
 kotlinx-metadata               = "0.9.0"
 kotlinx-reflect-lite           = "1.2.0-RC"
 kotlin-lincheck                = "3.2"
-kotlin-wrappers                = "2025.8.16"
+kotlin-wrappers                = "2025.8.18"
 kotlin-redacted                = "1.15.0-2.2.20-Beta2-alpha01"
 kotlin-serviceloader           = "0.0.19"
 kotlinx-multik                 = "0.2.3"
 kotlinx-dataframe              = "1.0.0-Beta2"
 kotlinx-kandy                  = "0.8.1-local-5-dev-74"
 kotlin-statistics              = "0.4.0-RC1"
 gradle-kotlin-dsl              = "6.2.0"
-exoquery-plugin                = "2.2.0-1.4.0.PL.RC5"
-exoquery-sql                   = "1.4.0.PL.RC5"
+exoquery-plugin                = "2.2.0-1.4.0.PL"
+exoquery-sql                   = "1.4.0.PL"
 exposed                        = "1.0.0-beta-5"
 postgresql                     = "42.7.7"
-embedded-postgres              = "2.1.0"
-embedded-postgres-bom          = "17.5.0"
+embedded-postgres              = "2.1.1"
+embedded-postgres-bom          = "17.6.0"
 evas                           = "1.3.0"
 kopy                           = "0.18.0+2.2.10"
 poko                           = "0.19.3"
@@ -72,7 +72,7 @@ otel-alpha                     = "1.53.0-alpha"
 otel-instr                     = "2.19.0"
 otel-instr-alpha               = "2.19.0-alpha"
 otel-semconv                   = "1.34.0"
-otel-contrib                   = "1.48.0-alpha"
+otel-contrib                   = "1.49.0-alpha"
 otel-kotlin                    = "0.4.0"
 okio                           = "3.16.0"
 sslcontext-kickstart           = "9.1.0"
@@ -169,7 +169,7 @@ async-profiler                 = "4.1"
 ap-loader-all                  = "4.1-10"
 openjdk-jmc                    = "9.1.0"
 airlift-aircompressor          = "2.0.2"
-airlift-security               = "349"
+airlift-security               = "350"
 directory-keystore             = "1.1.1"
 maven-mima                     = "3.0.0-alpha-3"
 maven-archeologist             = "0.0.10"
@@ -215,7 +215,7 @@ compose-hotreload              = "1.0.0-beta05"
 compose-icons                  = "1.1.1"
 compose-routing                = "0.4.0"
 kottie                         = "2.0.1"
-mosaic                         = "0.17.0"
+mosaic                         = "0.18.0"
 filekit-dialogs                = "0.10.0"
 
 # NPM Dependencies

plugins/project/src/main/kotlin/common/Multiplatform.kt

@@ -1,6 +1,5 @@
 package common
 
-import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.kotlin.dsl.*
@@ -52,7 +51,6 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
             api(libs.kotlinx.coroutines.slf4j)
             api(libs.jspecify)
             api(libs.bundles.keystore)
-            // https://kotlinlang.org/docs/ksp-multiplatform.html
             api(libs.google.auto.annotations)
             ksp(libs.ksp.auto.service)
           }
@@ -75,6 +73,25 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
       }
     }
 
+fun KotlinMultiplatformExtension.webDeps(project: Project) =
+    with(project) {
+      sourceSets {
+        webMain {
+          dependencies {
+            api(libs.ktor.client.js)
+            api(libs.kotlinx.browser)
+            // api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
+            // ksp(project(":meta:ksp:processor"))
+          }
+
+          // kotlin.srcDir("src/main/kotlin")
+          // resources.srcDir("src/main/resources")
+        }
+
+        webTest { kotlin {} }
+      }
+    }
+
 fun KotlinMultiplatformExtension.jsTarget(project: Project) =
     with(project) {
       js {
@@ -103,23 +120,7 @@ fun KotlinMultiplatformExtension.jsTarget(project: Project) =
         compilerOptions { configureKotlinJs() }
         testRuns.configureEach { executionTask.configure {} }
       }
-
-      sourceSets {
-        jsMain {
-          dependencies {
-            api(libs.ktor.client.js)
-            api(libs.kotlin.wrappers.browser)
-            api(libs.kotlin.wrappers.css)
-            // api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
-            // ksp(project(":meta:ksp:processor"))
-          }
-
-          // kotlin.srcDir("src/main/kotlin")
-          // resources.srcDir("src/main/resources")
-        }
-
-        jsTest { kotlin {} }
-      }
+      webDeps(project)
     }
 
 fun KotlinMultiplatformExtension.wasmJsTarget(project: Project) =
@@ -159,18 +160,7 @@ fun KotlinMultiplatformExtension.wasmJsTarget(project: Project) =
         compilerOptions { configureKotlinJs() }
         testRuns.configureEach { executionTask.configure {} }
       }
-
-      sourceSets {
-        wasmJsMain {
-          dependencies {
-            api(libs.ktor.client.js)
-            api(libs.kotlinx.browser)
-            api(libs.kotlin.wrappers.browser)
-            // api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
-          }
-        }
-        wasmJsTest { kotlin {} }
-      }
+      webDeps(project)
     }
 
 fun KotlinMultiplatformExtension.wasmWasiTarget(project: Project) =
@@ -205,21 +195,6 @@ fun KotlinMultiplatformExtension.wasmWasiTarget(project: Project) =
       }
     }
 
-fun KotlinMultiplatformExtension.hostNativeTarget(configure: KotlinNativeTarget.() -> Unit = {}) =
-    when {
-      Platform.isMac -> {
-        macosArm64 { configure() }
-        macosX64 { configure() }
-      }
-      Platform.isLinux -> {
-        linuxArm64 { configure() }
-        linuxX64 { configure() }
-      }
-      Platform.isWin -> mingwX64 { configure() }
-      else ->
-          throw GradleException("Host OS '${Platform.currentOS}' is not supported in Kotlin/Native")
-    }
-
 fun KotlinMultiplatformExtension.nativeTargets(
     project: Project,
     configure: KotlinNativeTarget.() -> Unit = {},
@@ -247,14 +222,7 @@ fun KotlinMultiplatformExtension.nativeTargets(
         mingwX64 { configureAll() }
       }
 
-      sourceSets {
-        nativeMain {
-          dependencies {
-            // On native targets, only curl currently supports TLS
-            api(libs.ktor.client.curl)
-          }
-        }
-      }
+      sourceSets { nativeMain { dependencies { api(libs.ktor.client.curl) } } }
     }
 
 fun KotlinMultiplatformExtension.addKspDependencyForAllTargets(

plugins/project/src/main/kotlin/common/ProjectExtns.kt

@@ -427,9 +427,7 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
           "-Xnested-type-aliases",
           "-Xreport-all-warnings",
           "-Xreturn-value-checker=check",
-          // "-Wextra",
-          // "-Xexpected-type-guided-resolution",
-          // "-XXLanguage:+ExplicitBackingFields",
+          "-Xcontext-sensitive-resolution",
           // "-Xsuppress-version-warnings",
           // "-P",
           // "plugin:...=..."
@@ -470,25 +468,13 @@ fun KotlinJvmCompilerOptions.configureKotlinJvm(project: Project) =
       suppressWarnings = false
       freeCompilerArgs.addAll(
           "-Xadd-modules=$addModules",
-          "-Xjsr305=strict",
-          "-Xjvm-default=all",
-          "-Xassertions=jvm",
-          "-Xemit-jvm-type-annotations",
-          "-Xjspecify-annotations=strict",
           "-Xskip-prerelease-check",
           "-Xwhen-expressions=indy",
-          // Remove null check intrinsics from bytecode
-          "-Xno-param-assertions",
-          "-Xno-call-assertions",
-          "-Xno-receiver-assertions",
           // "-Xjdk-release=${kotlinJvmTarget.get().target}",
           // "-Xadd-modules=ALL-MODULE-PATH",
           // "-Xmodule-path=",
           // "-Xjvm-enable-preview",
           // "-Xjavac-arguments=\"--add-exports java.base/sun.nio.ch=ALL-UNNAMED\"",
-          // "-Xexplicit-api={strict|warning|disable}",
-          // "-Xgenerate-strict-metadata-version",
-          // "-Xuse-kapt4",
       )
       // jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
     }