Update rules_kotlin to 2.4.21 with CodeQL patches

Carry forward CodeQL's jdeps and language/API-version customizations for the new upstream release, and fix redundant string conversions rejected by the upgraded Kotlin compiler.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: jketema

MODULE.bazel

@@ -26,7 +26,7 @@ bazel_dep(name = "bazel_skylib", version = "1.9.0")
 bazel_dep(name = "abseil-cpp", version = "20260107.1", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "json")
 bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
-bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1")
+bazel_dep(name = "rules_kotlin", version = "2.4.21-codeql.1")
 bazel_dep(name = "gazelle", version = "0.54.0")
 bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
 bazel_dep(name = "googletest", version = "1.18.0.bcr.1")

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -6966,7 +6966,7 @@ open class KotlinFileExtractor(
                     tw.writeExprs_stringliteral(id, type.javaResult.id, parent, idx)
                     tw.writeExprsKotlinType(id, type.kotlinResult.id)
                     extractExprContext(id, locId, enclosingCallable, enclosingStmt)
-                    tw.writeNamestrings(toQuotedLiteral(v.toString()), v.toString(), id)
+                    tw.writeNamestrings(toQuotedLiteral(v), v, id)
                 }
             }
             v == null -> {

misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch

@@ -1,21 +1,19 @@
+"""Bazel module manifest for the released rules_kotlin package."""
+
 module(
     name = "rules_kotlin",
-    version = "2.2.2-codeql.1",
+    version = "2.4.21-codeql.1",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
 
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_android", version = "0.6.4")
-bazel_dep(name = "bazel_features", version = "1.25.0")
-bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
-bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
-bazel_dep(name = "rules_cc", version = "0.0.16")
-bazel_dep(name = "bazel_worker_api", version = "0.0.8")
-bazel_dep(name = "bazel_worker_java", version = "0.0.8")
+bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "rules_android", version = "0.7.3")
+bazel_dep(name = "bazel_features", version = "1.39.0")
+bazel_dep(name = "bazel_lib", version = "3.1.0")
 
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
@@ -26,13 +24,16 @@ rules_kotlin_extensions = use_extension(
 )
 use_repo(
     rules_kotlin_extensions,
+    "btapi_impl",
     "com_github_google_ksp",
     "com_github_jetbrains_kotlin",
     "com_github_pinterest_ktlint",
-    "kotlin_build_tools_impl",
+    "jarjar",
+    "kotlin_build_tools_api",
+    "kotlinx_coroutines_core_jvm",
     "kotlinx_serialization_core_jvm",
     "kotlinx_serialization_json",
     "kotlinx_serialization_json_jvm",
 )
 
-register_toolchains("//kotlin/internal:default_toolchain")
+register_toolchains("//kotlin:default_toolchain")

misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json

@@ -4,12 +4,6 @@ allows us to not have to specify that option (and therefore pull in `rules_kotli
 internal repo.
 --- a/kotlin/settings/BUILD.bazel
 +++ b/kotlin/settings/BUILD.bazel
-@@ -16,6 +16,6 @@ release_archive(
- # Flag that controls the emission of jdeps files during kotlin jvm compilation.
- bool_flag(
-     name = "jvm_emit_jdeps",
+@@ -19 +19 @@
 -    build_setting_default = True,  # Upstream default behavior
 +    build_setting_default = False,
-     visibility = ["//visibility:public"],
- )
-

…rules_kotlin/2.2.2-codeql.1/MODULE.bazel …ules_kotlin/2.4.21-codeql.1/MODULE.bazelmisc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel renamed to misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/MODULE.bazel misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel renamed to misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/MODULE.bazel

@@ -0,0 +1,5 @@
+--- a/src/main/starlark/core/options/opts.kotlinc.bzl
++++ b/src/main/starlark/core/options/opts.kotlinc.bzl
+@@ -98 +98 @@
+-    return ["-language-version=%s" % version]
++    return ["-language-version=%s" % version, "-api-version=%s" % version]

…1/patches/codeql_do_not_emit_jdeps.patch …1/patches/codeql_do_not_emit_jdeps.patchmisc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_emit_jdeps.patch misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_emit_jdeps.patch

@@ -0,0 +1,5 @@
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -5 +5 @@
+-    version = "1.9.0",
++    version = "2.4.21-codeql.1",

misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_language_and_api_version.patch

@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-qjJVRS2+m1LaK6d4fwhl8QeAWIUQnznD1br8IaUhvLY=",
+    "url": "https://github.com/bazel-contrib/rules_kotlin/releases/download/v2.4.21/rules_kotlin-v2.4.21.tar.gz",
+    "patches": {
+        "codeql_do_not_emit_jdeps.patch": "sha256-nS1N5h/nA2+y5nIdkdRxHGfp+m/EKq4B5UQF6DXzcYs=",
+        "codeql_language_and_api_version.patch": "sha256-3ge9oiBmjhY7qPhYZpuN8E1e2Bv0ntsVpy98WOJv2To=",
+        "module_dot_bazel_version.patch": "sha256-B7mPGSMEt4J5l+8aMpcrBP7pcvuPvxqPEfh8LXy5p0U="
+    },
+    "patch_strip": 1
+}

misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/module_dot_bazel_version.patch

@@ -21,7 +21,7 @@
         "github:bazelbuild/rules_kotlin"
     ],
     "versions": [
-        "2.2.2-codeql.1"
+        "2.4.21-codeql.1"
     ],
     "yanked_versions": {}
 }