diff --git a/MODULE.bazel b/MODULE.bazel index 2ed05212634..e410dfae3d6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,7 +2,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_java", version = "8.6.0") bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep(name = "rules_android", version = "0.6.0") -bazel_dep(name = "rules_kotlin", version = "2.1.9", repo_name = "io_bazel_rules_kotlin") +bazel_dep(name = "rules_kotlin", version = "2.2.1", repo_name = "io_bazel_rules_kotlin") bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric") bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") @@ -46,9 +46,9 @@ GRPC_VERSION = "1.2.0" INCAP_VERSION = "0.2" -KOTLIN_VERSION = "2.2.20" +KOTLIN_VERSION = "2.3.0" -KSP_VERSION = KOTLIN_VERSION + "-2.0.3" +KSP_VERSION = "2.3.4" MAVEN_VERSION = "3.3.3" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17c17408c4b..ae65733e6a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,9 @@ jdk = "17" junit = "4.13" jvmTarget = "1.8" kotlin = "2.2.20" +kotlinMetadata = "2.3.0" kotlinTarget = "1.9" -ksp = "2.2.20-2.0.3" +ksp = "2.4.3" publish = "0.30.0" shadow = "8.3.5" truth = "1.4.0" @@ -62,7 +63,7 @@ junit = { module = "junit:junit", version.ref = "junit" } kotlin-annotationProcessingEmbeddable = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" } kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -kotlin-metadataJvm = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" } +kotlin-metadataJvm = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlinMetadata" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.11.0" } kotlinPoet-javaPoet = { module = "com.squareup:kotlinpoet-javapoet", version = "1.11.0" } diff --git a/maven_install.json b/maven_install.json index 01580eb23b2..e946d85ba7f 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1666003098, - "__RESOLVED_ARTIFACTS_HASH": 1544387501, + "__INPUT_ARTIFACTS_HASH": 1283398395, + "__RESOLVED_ARTIFACTS_HASH": 844446531, "conflict_resolution": { "androidx.test:monitor:1.4.0": "androidx.test:monitor:1.7.2", "com.google.auto.value:auto-value-annotations:1.9": "com.google.auto.value:auto-value-annotations:1.11.0", @@ -589,29 +589,29 @@ }, "version": "2.10.1" }, - "com.google.devtools.ksp:symbol-processing": { - "shasums": { - "jar": "61c63ba42d2d4c5955adae636cde56244b45820199d01ba0806b0e8c0e44fee3" - }, - "version": "2.2.20-2.0.3" - }, "com.google.devtools.ksp:symbol-processing-aa-embeddable": { "shasums": { - "jar": "e807e7c2f34ec6f44e52f2139836f18a0be66c08bd77ab966af8c28d87bece6f" + "jar": "7c183299d072f9a797585c75afa8c8dad4f92d8b7d961232c96a3840f7d1db81" }, - "version": "2.2.20-2.0.3" + "version": "2.3.4" }, "com.google.devtools.ksp:symbol-processing-api": { "shasums": { "jar": "a20644569ecc01467d3efe4f8b9787a8719ce27ed12b6a3475ae1d82bfb16a0e" }, - "version": "2.2.20-2.0.3" + "version": "2.3.4" }, "com.google.devtools.ksp:symbol-processing-common-deps": { "shasums": { "jar": "618db61b5aa753838ef86e726e73f359be8c29b6cd467e36871bc17ea86735d0" }, - "version": "2.2.20-2.0.3" + "version": "2.3.4" + }, + "com.google.devtools.ksp:symbol-processing:pom": { + "shasums": { + "jar": "69c6b9167ac17a4679a7640bedbbb272880abd4f7fea8dc169bfb8db2cab6af0" + }, + "version": "2.3.4" }, "com.google.errorprone:error_prone_annotation": { "shasums": { @@ -1167,27 +1167,27 @@ }, "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable": { "shasums": { - "jar": "85cfce4e412a1d68124143edc2b454c89146d5841bcc19e655e9af96a24741a3" + "jar": "3dc5e1e1d4017901bfd4c3d20fb5c5a1c769b8a1dba8c0182ff28a0a8b7f491c" }, - "version": "2.2.20" + "version": "2.3.0" }, "org.jetbrains.kotlin:kotlin-compiler-embeddable": { "shasums": { - "jar": "1c6c3f810bfe6a41abcbc34b3a2ef639f1e3f4aeed3a953a4b0974eea4f41889" + "jar": "8dbd882fa58c3d17e683a27390288315f8b490f8e3e3b1be4dc3e280d37e285a" }, - "version": "2.2.20" + "version": "2.3.0" }, "org.jetbrains.kotlin:kotlin-daemon-embeddable": { "shasums": { - "jar": "7c5c8cd2f8beadd3283239bb9ca219a0cafa1af02682b407b181e1179718f2f7" + "jar": "39bcb02d8c293aa678554c8b49d7ff84657021709283c6186e3a40806af9bd10" }, - "version": "2.2.20" + "version": "2.3.0" }, "org.jetbrains.kotlin:kotlin-metadata-jvm": { "shasums": { - "jar": "8524eac90f7e8e0f1366883f2c6c820c93bfa61df3d76857c8d3e803cf67315d" + "jar": "0c64203991d0232d989cd5e366d6028d27b1b087240818178bd50c268eeab56f" }, - "version": "2.2.20" + "version": "2.3.0" }, "org.jetbrains.kotlin:kotlin-reflect": { "shasums": { @@ -1197,21 +1197,15 @@ }, "org.jetbrains.kotlin:kotlin-script-runtime": { "shasums": { - "jar": "5c8bd5dd7ae1ea2eeb2778fdbeaa19a562184975f6cab8a0bb6779e4190731ae" + "jar": "db826961371d6605318d9c4e4bfcdbfac94c3a0892cdcabd55224870fead57f1" }, - "version": "2.2.20" + "version": "2.3.0" }, "org.jetbrains.kotlin:kotlin-stdlib": { "shasums": { - "jar": "8836ccffd3585fadda9901244b20d42901d2f3cd581058d8434e2ffabcf3a3e7" + "jar": "887587c91713250ad52fe14ad9166d042c33835049890e9437f355ffc5a195b1" }, - "version": "2.2.20" - }, - "org.jetbrains.kotlin:kotlin-stdlib-common": { - "shasums": { - "jar": "60b53a3fc0ed19ff5568ad54372f102f51109b7480417e93c8f3418ae4f73188" - }, - "version": "1.9.22" + "version": "2.3.0" }, "org.jetbrains.kotlin:kotlin-stdlib-jdk7": { "shasums": { @@ -1243,24 +1237,6 @@ }, "version": "1.8.0" }, - "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm": { - "shasums": { - "jar": "29c821a8d4e25cbfe4f2ce96cdd4526f61f8f4e69a135f9612a34a81d93b65f1" - }, - "version": "1.6.3" - }, - "org.jetbrains.kotlinx:kotlinx-serialization-json": { - "shasums": { - "jar": "8c0016890a79ab5980dd520a5ab1a6738023c29aa3b6437c482e0e5fdc06dab1" - }, - "version": "1.6.3" - }, - "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm": { - "shasums": { - "jar": "d3234179bcff1886d53d67c11eca47f7f3cf7b63c349d16965f6db51b7f3dd9a" - }, - "version": "1.6.3" - }, "org.jetbrains:annotations": { "shasums": { "jar": "7b0f19724082cbfcbc66e5abea2b9bc92cf08a1ea11e191933ed43801eb3cd05" @@ -1943,11 +1919,6 @@ "com.google.auto:auto-common": [ "com.google.guava:guava" ], - "com.google.devtools.ksp:symbol-processing": [ - "com.google.devtools.ksp:symbol-processing-api", - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlinx:kotlinx-serialization-json" - ], "com.google.devtools.ksp:symbol-processing-aa-embeddable": [ "com.google.devtools.ksp:symbol-processing-api", "com.google.devtools.ksp:symbol-processing-common-deps", @@ -2207,18 +2178,6 @@ "org.jetbrains.kotlin:kotlin-stdlib", "org.jetbrains:annotations" ], - "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm": [ - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common" - ], - "org.jetbrains.kotlinx:kotlinx-serialization-json": [ - "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm" - ], - "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm": [ - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" - ], "org.jvnet.staxex:stax-ex": [ "jakarta.activation:jakarta.activation-api", "jakarta.xml.bind:jakarta.xml.bind-api" @@ -3672,18 +3631,6 @@ "com.google.gson.reflect", "com.google.gson.stream" ], - "com.google.devtools.ksp:symbol-processing": [ - "com.google.devtools.ksp", - "com.google.devtools.ksp.common", - "com.google.devtools.ksp.common.impl", - "com.google.devtools.ksp.common.visitor", - "com.google.devtools.ksp.processing.impl", - "com.google.devtools.ksp.symbol.impl", - "com.google.devtools.ksp.symbol.impl.binary", - "com.google.devtools.ksp.symbol.impl.java", - "com.google.devtools.ksp.symbol.impl.kotlin", - "com.google.devtools.ksp.symbol.impl.synthetic" - ], "com.google.devtools.ksp:symbol-processing-aa-embeddable": [ "com.google.devtools.ksp.cmdline", "com.google.devtools.ksp.impl", @@ -4054,10 +4001,6 @@ "ksp.javaslang.match.annotation", "ksp.javaslang.match.generator", "ksp.javaslang.match.model", - "ksp.javax.annotation", - "ksp.javax.annotation.concurrent", - "ksp.javax.annotation.meta", - "ksp.javax.inject", "ksp.kotlinx.collections.immutable", "ksp.kotlinx.collections.immutable.adapters", "ksp.kotlinx.collections.immutable.implementations.immutableList", @@ -4885,7 +4828,9 @@ "ksp.org.jetbrains.org.objectweb.asm.tree", "ksp.org.jetbrains.org.objectweb.asm.tree.analysis", "ksp.org.jetbrains.org.objectweb.asm.util", - "ksp.org.picocontainer" + "ksp.org.picocontainer", + "org.checkerframework.checker.nullness.qual", + "org.jetbrains.annotations" ], "com.google.devtools.ksp:symbol-processing-api": [ "com.google.devtools.ksp", @@ -6286,6 +6231,12 @@ "org.jetbrains.kotlin.analysis.decompiler.stub", "org.jetbrains.kotlin.analysis.decompiler.stub.file", "org.jetbrains.kotlin.analysis.decompiler.stub.flags", + "org.jetbrains.kotlin.analysis.utils", + "org.jetbrains.kotlin.analysis.utils.caches", + "org.jetbrains.kotlin.analysis.utils.collections", + "org.jetbrains.kotlin.analysis.utils.errors", + "org.jetbrains.kotlin.analysis.utils.printer", + "org.jetbrains.kotlin.analysis.utils.relfection", "org.jetbrains.kotlin.analyzer", "org.jetbrains.kotlin.analyzer.common", "org.jetbrains.kotlin.asJava", @@ -6296,12 +6247,6 @@ "org.jetbrains.kotlin.backend.common", "org.jetbrains.kotlin.backend.common.actualizer", "org.jetbrains.kotlin.backend.common.actualizer.checker", - "org.jetbrains.kotlin.backend.common.checkers", - "org.jetbrains.kotlin.backend.common.checkers.context", - "org.jetbrains.kotlin.backend.common.checkers.declaration", - "org.jetbrains.kotlin.backend.common.checkers.expression", - "org.jetbrains.kotlin.backend.common.checkers.symbol", - "org.jetbrains.kotlin.backend.common.checkers.type", "org.jetbrains.kotlin.backend.common.descriptors", "org.jetbrains.kotlin.backend.common.diagnostics", "org.jetbrains.kotlin.backend.common.extensions", @@ -6326,7 +6271,6 @@ "org.jetbrains.kotlin.backend.common.serialization.metadata", "org.jetbrains.kotlin.backend.common.serialization.proto", "org.jetbrains.kotlin.backend.common.serialization.signature", - "org.jetbrains.kotlin.backend.js", "org.jetbrains.kotlin.backend.jvm", "org.jetbrains.kotlin.backend.jvm.caches", "org.jetbrains.kotlin.backend.jvm.codegen", @@ -6363,9 +6307,13 @@ "org.jetbrains.kotlin.build.report.statistics", "org.jetbrains.kotlin.build.report.statistics.file", "org.jetbrains.kotlin.buildtools.api", + "org.jetbrains.kotlin.buildtools.api.arguments", + "org.jetbrains.kotlin.buildtools.api.arguments.enums", "org.jetbrains.kotlin.buildtools.api.internal", "org.jetbrains.kotlin.buildtools.api.internal.wrappers", "org.jetbrains.kotlin.buildtools.api.jvm", + "org.jetbrains.kotlin.buildtools.api.jvm.operations", + "org.jetbrains.kotlin.buildtools.api.trackers", "org.jetbrains.kotlin.buildtools.internal", "org.jetbrains.kotlin.builtins", "org.jetbrains.kotlin.builtins.functions", @@ -6431,7 +6379,6 @@ "org.jetbrains.kotlin.codegen.serialization", "org.jetbrains.kotlin.codegen.signature", "org.jetbrains.kotlin.codegen.state", - "org.jetbrains.kotlin.codegen.when", "org.jetbrains.kotlin.com.fasterxml.aalto", "org.jetbrains.kotlin.com.fasterxml.aalto.impl", "org.jetbrains.kotlin.com.fasterxml.aalto.in", @@ -6641,6 +6588,7 @@ "org.jetbrains.kotlin.compiler.plugin", "org.jetbrains.kotlin.compilerRunner", "org.jetbrains.kotlin.config", + "org.jetbrains.kotlin.config.nativeBinaryOptions", "org.jetbrains.kotlin.config.phaser", "org.jetbrains.kotlin.constant", "org.jetbrains.kotlin.container", @@ -6829,9 +6777,9 @@ "org.jetbrains.kotlin.ir.backend.js.checkers.declarations", "org.jetbrains.kotlin.ir.backend.js.checkers.expressions", "org.jetbrains.kotlin.ir.backend.js.dce", - "org.jetbrains.kotlin.ir.backend.js.export", "org.jetbrains.kotlin.ir.backend.js.ic", "org.jetbrains.kotlin.ir.backend.js.ir", + "org.jetbrains.kotlin.ir.backend.js.jsexport", "org.jetbrains.kotlin.ir.backend.js.lower", "org.jetbrains.kotlin.ir.backend.js.lower.calls", "org.jetbrains.kotlin.ir.backend.js.lower.cleanup", @@ -6839,8 +6787,11 @@ "org.jetbrains.kotlin.ir.backend.js.lower.inline", "org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir", "org.jetbrains.kotlin.ir.backend.js.transformers.irToJs", + "org.jetbrains.kotlin.ir.backend.js.tsexport", "org.jetbrains.kotlin.ir.backend.js.utils", "org.jetbrains.kotlin.ir.backend.js.utils.serialization", + "org.jetbrains.kotlin.ir.backend.js.wasm", + "org.jetbrains.kotlin.ir.backend.js.wasm.declarations", "org.jetbrains.kotlin.ir.backend.jvm", "org.jetbrains.kotlin.ir.backend.jvm.serialization", "org.jetbrains.kotlin.ir.builders", @@ -6872,6 +6823,13 @@ "org.jetbrains.kotlin.ir.types", "org.jetbrains.kotlin.ir.types.impl", "org.jetbrains.kotlin.ir.util", + "org.jetbrains.kotlin.ir.validation", + "org.jetbrains.kotlin.ir.validation.checkers", + "org.jetbrains.kotlin.ir.validation.checkers.context", + "org.jetbrains.kotlin.ir.validation.checkers.declaration", + "org.jetbrains.kotlin.ir.validation.checkers.expression", + "org.jetbrains.kotlin.ir.validation.checkers.symbol", + "org.jetbrains.kotlin.ir.validation.checkers.type", "org.jetbrains.kotlin.ir.visitors", "org.jetbrains.kotlin.it.unimi.dsi.fastutil", "org.jetbrains.kotlin.it.unimi.dsi.fastutil.booleans", @@ -7051,6 +7009,7 @@ "org.jetbrains.kotlin.resolve.calls.tower", "org.jetbrains.kotlin.resolve.calls.util", "org.jetbrains.kotlin.resolve.checkers", + "org.jetbrains.kotlin.resolve.codegen", "org.jetbrains.kotlin.resolve.constants", "org.jetbrains.kotlin.resolve.constants.evaluate", "org.jetbrains.kotlin.resolve.deprecation", @@ -7312,18 +7271,6 @@ "kotlinx.coroutines.sync", "kotlinx.coroutines.time" ], - "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm": [ - "kotlinx.serialization", - "kotlinx.serialization.builtins", - "kotlinx.serialization.descriptors", - "kotlinx.serialization.encoding", - "kotlinx.serialization.internal", - "kotlinx.serialization.modules" - ], - "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm": [ - "kotlinx.serialization.json", - "kotlinx.serialization.json.internal" - ], "org.jetbrains:annotations": [ "org.intellij.lang.annotations", "org.jetbrains.annotations" @@ -7744,10 +7691,10 @@ "com.google.auto:auto-common", "com.google.code.findbugs:jsr305", "com.google.code.gson:gson", - "com.google.devtools.ksp:symbol-processing", "com.google.devtools.ksp:symbol-processing-aa-embeddable", "com.google.devtools.ksp:symbol-processing-api", "com.google.devtools.ksp:symbol-processing-common-deps", + "com.google.devtools.ksp:symbol-processing:pom", "com.google.errorprone:error_prone_annotation", "com.google.errorprone:error_prone_annotations", "com.google.errorprone:error_prone_check_api", @@ -7847,15 +7794,11 @@ "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-script-runtime", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.jetbrains.kotlin:kotlin-test", "org.jetbrains.kotlinx:kotlinx-coroutines-android", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", - "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm", - "org.jetbrains.kotlinx:kotlinx-serialization-json", - "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm", "org.jetbrains:annotations", "org.jspecify:jspecify", "org.jvnet.staxex:stax-ex", @@ -7980,10 +7923,10 @@ "com.google.auto:auto-common", "com.google.code.findbugs:jsr305", "com.google.code.gson:gson", - "com.google.devtools.ksp:symbol-processing", "com.google.devtools.ksp:symbol-processing-aa-embeddable", "com.google.devtools.ksp:symbol-processing-api", "com.google.devtools.ksp:symbol-processing-common-deps", + "com.google.devtools.ksp:symbol-processing:pom", "com.google.errorprone:error_prone_annotation", "com.google.errorprone:error_prone_annotations", "com.google.errorprone:error_prone_check_api", @@ -8083,15 +8026,11 @@ "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-script-runtime", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.jetbrains.kotlin:kotlin-test", "org.jetbrains.kotlinx:kotlinx-coroutines-android", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", - "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm", - "org.jetbrains.kotlinx:kotlinx-serialization-json", - "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm", "org.jetbrains:annotations", "org.jspecify:jspecify", "org.jvnet.staxex:stax-ex", @@ -8228,15 +8167,10 @@ "com.google.auto.value.processor.AutoValueProcessor" ] }, - "com.google.devtools.ksp:symbol-processing": { - "org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor": [ - "com.google.devtools.ksp.KotlinSymbolProcessingCommandLineProcessor" - ], - "org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar": [ - "com.google.devtools.ksp.KotlinSymbolProcessingComponentRegistrar" - ] - }, "com.google.devtools.ksp:symbol-processing-aa-embeddable": { + "javax.annotation.processing.Processor": [ + "ksp.javaslang.match.PatternsProcessor" + ], "javax.xml.stream.XMLEventFactory": [ "ksp.com.fasterxml.aalto.stax.EventFactoryImpl" ], @@ -8254,9 +8188,6 @@ "kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition", "kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition" ], - "ksp.javax.annotation.processing.Processor": [ - "ksp.javaslang.match.PatternsProcessor" - ], "ksp.org.jetbrains.kotlin.builtins.BuiltInsLoader": [ "ksp.org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInsLoaderImpl" ],