Bump kotlin from 2.2.21 to 2.3.0 #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

OptimumCode merged 7 commits into main from dependabot/gradle/kotlin-2.3.0

Feb 15, 2026

buildSrc/src/main/kotlin/convention.multiplatform-lib.gradle.kts

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,8 +27,6 @@ kotlin { @@
         nodejs()
       }
-      applyDefaultHierarchyTemplate()
       macosX64()
       macosArm64()
       iosX64()
@@ Expand All / @@ -39,6 +37,8 @@ kotlin { @@
       linuxArm64()
       mingwX64()
+      applyDefaultHierarchyTemplate()
     }
     ktlint {
@@ Expand Down @@

buildSrc/src/main/kotlin/convention.multiplatform-tests.gradle.kts

-Original file line number
+Diff line change
@@ -1,4 +1,8 @@
     import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
+    import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
+    import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
+    import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.WasmNodeJsRootExtension
+    import tasks.KarmaReportWorkaround
     plugins {
       id("convention.kotlin")
@@ Expand Down Expand Up / @@ -28,11 +32,32 @@ kotlin.targets.configureEach { @@
         name.startsWith("ios") || name.startsWith("macos") -> {
           macOsAllTest.dependsOn(tasks.named("${name}Test"))
         }
         name.startsWith("mingw") -> {
           windowsAllTest.dependsOn(tasks.named("${name}Test"))
         }
         else -> {
           linuxAllTest.dependsOn(tasks.named("${name}Test"))
         }
       }
+    }
+    val karmaReportWorkaround =
+      tasks.register<KarmaReportWorkaround>("karmaReportWorkaround") {
+        val nodeJsRootExtension = rootProject.extensions.getByType<NodeJsRootExtension>()
+        val wasmNodeJsRootExtension = rootProject.extensions.getByType<WasmNodeJsRootExtension>()
+        shouldRunAfter(nodeJsRootExtension.npmInstallTaskProvider, wasmNodeJsRootExtension.npmInstallTaskProvider)
+      }
+    tasks.withType<KotlinJsTest> {
+      when (name) {
+        "jsBrowserTest" -> dependsOn(karmaReportWorkaround)
+        // For some reasons, the output of wasmJsBrowserTest is not captured correclty
+        // NOTE: the reason is the same as for JS but same workaround does not work...
+        "wasmJsBrowserTest" -> failOnNoDiscoveredTests = false
+        else -> Unit
+      }
     }

buildSrc/src/main/kotlin/tasks/KarmaReportWorkaround.kt

-Original file line number
+Diff line change
@@ -0,0 +1,41 @@
+    package tasks
+    import org.gradle.api.DefaultTask
+    import org.gradle.api.file.RegularFileProperty
+    import org.gradle.api.tasks.InputFile
+    import org.gradle.api.tasks.TaskAction
+    /**
+     * Applies a workaround for kotlin-karma-reporter to append new lines when flushing log messages
+     */
+    abstract class KarmaReportWorkaround : DefaultTask() {
+      @get:InputFile
+      val karmaReporterFile: RegularFileProperty =
+        project.objects
+          .fileProperty()
+          .convention(
+            project.rootProject.layout.buildDirectory
+              .file("js/node_modules/kotlin-web-helpers/dist/karma-kotlin-reporter.js"),
+          )
+      @TaskAction
+      protected fun applyWorkaround() {
+        val reporterFile = karmaReporterFile.get().asFile
+        logger.lifecycle("Applying karma reporter workaround to file: {}", reporterFile)
+        val karmaReporterContent = reporterFile.readText()
+        // We append add a new line after each log line to ensure we don't get large single line in the end
+        // The line larger than 1MB cannot be parsed by TCServiceMessageOutputStreamHandler
+        // https://github.com/JetBrains/kotlin/blob/679366a83f99851b42f64795f10ed803ff011c73/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessageOutputStreamHandler.kt#L25C16-L25C51
+        val expectedWriteLine = "this.write(line); if (browserResult.log.length > 0) { self.write('\\n'); }"
+        if (karmaReporterContent.contains(expectedWriteLine)) {
+          // Alrady updated
+          return
+        }
+        reporterFile.writeText(
+          karmaReporterContent.replace(
+            "this.write(line);",
+            expectedWriteLine,
+          ),
+        )
+      }
+    }

gradle/libs.versions.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    [versions]

    kotlin = "2.2.21"

    kotest = "6.0.4"

    kotlin = "2.3.10"

    kotest = "6.1.3"

    detekt = "1.23.8"

    okio = "3.16.4"

    serialization = "1.9.0"

    serialization = "1.10.0"

    benchmark = "0.4.15"

    openapi = "2026.1"

    jackson = "2.20.1"

gradle/wrapper/gradle-wrapper.properties

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     distributionBase=GRADLE_USER_HOME
     distributionPath=wrapper/dists
-    distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+    distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
     networkTimeout=10000
     validateDistributionUrl=true
     zipStoreBase=GRADLE_USER_HOME
@@ Expand Down @@

json-schema-validator/api/json-schema-validator.api

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -156,8 +156,8 @@ public final class io/github/optimumcode/json/schema/JsonSchemaLoader$DefaultImp
  
    	public static fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Ljava/lang/String;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lkotlinx/serialization/json/JsonElement;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lkotlinx/serialization/json/JsonElement;Lcom/eygraber/uri/Uri;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static synthetic fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lkotlinx/serialization/json/JsonElement;Ljava/lang/String;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static synthetic fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lkotlinx/serialization/json/JsonElement;Ljava/lang/String;Lio/github/optimumcode/json/schema/SchemaType;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lkotlinx/serialization/json/JsonElement;Ljava/lang/String;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static fun register (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lkotlinx/serialization/json/JsonElement;Ljava/lang/String;Lio/github/optimumcode/json/schema/SchemaType;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    	public static fun registerWellKnown (Lio/github/optimumcode/json/schema/JsonSchemaLoader;Lio/github/optimumcode/json/schema/SchemaType;)Lio/github/optimumcode/json/schema/JsonSchemaLoader;

    }

    @@ -346,7 +346,7 @@ public abstract interface class io/github/optimumcode/json/schema/extension/Exte
  
    public final class io/github/optimumcode/json/schema/extension/ExternalAssertion$DefaultImpls {

    	public static fun validate (Lio/github/optimumcode/json/schema/extension/ExternalAssertion;Lio/github/optimumcode/json/schema/model/AbstractElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z

    	public static synthetic fun validate (Lio/github/optimumcode/json/schema/extension/ExternalAssertion;Lkotlinx/serialization/json/JsonElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z

    	public static fun validate (Lio/github/optimumcode/json/schema/extension/ExternalAssertion;Lkotlinx/serialization/json/JsonElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z

    }

    public abstract interface class io/github/optimumcode/json/schema/extension/ExternalAssertionContext {

kotlin-js-store/yarn.lock

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -713,10 +713,10 @@ engine.io@~6.5.2:
  
        engine.io-parser "~5.2.1"

        ws "~8.11.0"

    enhanced-resolve@^5.17.2:

      version "5.18.3"

      resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"

      integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==

    enhanced-resolve@^5.17.3:

      version "5.18.4"

      resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz#c22d33055f3952035ce6a144ce092447c525f828"

      integrity sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==

      dependencies:

        graceful-fs "^4.2.4"

        tapable "^2.2.0"

    @@ -1090,6 +1090,11 @@ is-number@^7.0.0:
  
      resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"

      integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==

    is-path-inside@^3.0.3:

      version "3.0.3"

      resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"

      integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==

    is-plain-obj@^2.1.0:

      version "2.1.0"

      resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"

    @@ -1194,10 +1199,9 @@ karma-webpack@5.0.1:
  
        minimatch "^9.0.3"

        webpack-merge "^4.1.5"

    karma@6.4.4:

    "karma@github:Kotlin/karma#6.4.5":

      version "6.4.4"

      resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"

      integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==

      resolved "https://codeload.github.com/Kotlin/karma/tar.gz/239a8fc984584f0d96b1dd750e7a5e2c79da93a6"

      dependencies:

        "@colors/colors" "1.5.0"

        body-parser "^1.19.0"

    @@ -1229,10 +1233,10 @@ kind-of@^6.0.2:
  
      resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"

      integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==

    kotlin-web-helpers@2.1.0:

      version "2.1.0"

      resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"

      integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==

    kotlin-web-helpers@3.0.0:

      version "3.0.0"

      resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9"

      integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==

      dependencies:

        format-util "^1.0.5"

    @@ -1349,10 +1353,10 @@ mkdirp@^0.5.5:
  
      dependencies:

        minimist "^1.2.6"

    mocha@11.7.1:

      version "11.7.1"

      resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"

      integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==

    mocha@11.7.5:

      version "11.7.5"

      resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.5.tgz#58f5bbfa5e0211ce7e5ee6128107cefc2515a627"

      integrity sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==

      dependencies:

        browser-stdout "^1.3.1"

        chokidar "^4.0.1"

    @@ -1362,6 +1366,7 @@ mocha@11.7.1:
  
        find-up "^5.0.0"

        glob "^10.4.5"

        he "^1.2.0"

        is-path-inside "^3.0.3"

        js-yaml "^4.1.0"

        log-symbols "^4.1.0"

        minimatch "^9.0.5"

    @@ -1877,10 +1882,10 @@ type-is@~1.6.18:
  
        media-typer "0.3.0"

        mime-types "~2.1.24"

    typescript@5.8.3:

      version "5.8.3"

      resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"

      integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==

    typescript@5.9.3:

      version "5.9.3"

      resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"

      integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==

    ua-parser-js@^0.7.30:

      version "0.7.35"

    @@ -1968,10 +1973,10 @@ webpack-sources@^3.3.3:
  
      resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"

      integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==

    webpack@5.100.2:

      version "5.100.2"

      resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"

      integrity sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==

    webpack@5.101.3:

      version "5.101.3"

      resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.101.3.tgz#3633b2375bb29ea4b06ffb1902734d977bc44346"

      integrity sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==

      dependencies:

        "@types/eslint-scope" "^3.7.7"

        "@types/estree" "^1.0.8"

    @@ -1983,7 +1988,7 @@ webpack@5.100.2:
  
        acorn-import-phases "^1.0.3"

        browserslist "^4.24.0"

        chrome-trace-event "^1.0.2"

        enhanced-resolve "^5.17.2"

        enhanced-resolve "^5.17.3"

        es-module-lexer "^1.2.1"

        eslint-scope "5.1.1"

        events "^3.2.0"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump kotlin from 2.2.21 to 2.3.0 #379

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!