Use upstream rules_kotlin 2.4.21 module

The BCR already provides the release's corrected module metadata, so consume 2.4.21 directly instead of maintaining a duplicate CodeQL registry entry and patches. Retain the Kotlin string conversion fix required by the upgraded 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.4.21-codeql.1")
+bazel_dep(name = "rules_kotlin", version = "2.4.21")
 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")

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

@@ -1,19 +1,21 @@
-"""Bazel module manifest for the released rules_kotlin package."""
-
 module(
     name = "rules_kotlin",
-    version = "2.4.21-codeql.1",
+    version = "2.2.2-codeql.1",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
 
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_java", version = "8.9.0")
-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")
+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")
 
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
@@ -24,16 +26,13 @@ rules_kotlin_extensions = use_extension(
 )
 use_repo(
     rules_kotlin_extensions,
-    "btapi_impl",
     "com_github_google_ksp",
     "com_github_jetbrains_kotlin",
     "com_github_pinterest_ktlint",
-    "jarjar",
-    "kotlin_build_tools_api",
-    "kotlinx_coroutines_core_jvm",
+    "kotlin_build_tools_impl",
     "kotlinx_serialization_core_jvm",
     "kotlinx_serialization_json",
     "kotlinx_serialization_json_jvm",
 )
 
-register_toolchains("//kotlin:default_toolchain")
+register_toolchains("//kotlin/internal:default_toolchain")

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

@@ -0,0 +1,30 @@
+--- a/src/main/starlark/core/options/opts.kotlinc.bzl	2000-01-01 01:00:00.000000000 +0100
++++ b/src/main/starlark/core/options/opts.kotlinc.bzl	2025-11-17 16:51:01.012063056 +0100
+@@ -51,6 +51,11 @@
+         return None
+     return ["-Xjdk-release=%s" % version]
+
++def _map_language_version_to_flag(version):
++    if not version:
++        return None
++    return ["-language-version=%s" % version, "-api-version=%s" % version]
++
+ _KOPTS_ALL = {
+     "include_stdlibs": struct(
+         args = dict(
+@@ -495,6 +500,15 @@
+         value_to_flag = None,
+         map_value_to_flag = _map_warning_level,
+     ),
++    "language_version": struct(
++        args = dict(
++            default = "1.9",
++            doc = "-language-version",
++        ),
++        type = attr.string,
++        value_to_flag = None,
++        map_value_to_flag = _map_language_version_to_flag,
++    ),
+ }
+
+ def _merge(key, rule_defined):

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

@@ -4,6 +4,12 @@ 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
-@@ -19 +19 @@
+@@ -16,6 +16,6 @@ release_archive(
+ # Flag that controls the emission of jdeps files during kotlin jvm compilation.
+ bool_flag(
+     name = "jvm_emit_jdeps",
 -    build_setting_default = True,  # Upstream default behavior
 +    build_setting_default = False,
+     visibility = ["//visibility:public"],
+ )
+

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

@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-QR2yavs0ksyDUbW1NJkxUir+LFTyZRttEncwoSVtD2A=",
+    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.2.2/rules_kotlin-v2.2.2.tar.gz",
+    "patches": {
+        "codeql_add_language_version_option.patch": "sha256-HoH8NWXxmYHmm/SxaugRdXgMntvcQx5gRLW2yQIvWhM=",
+        "codeql_do_not_emit_jdeps.patch": "sha256-cg06knW+Eq13qHCaelbnZka/WnGPvRrcqXHtpXsy/rA="
+    },
+    "patch_strip": 1
+}

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

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