Carry CodeQL Kotlin patches to 2.4.21

Keep the CodeQL-specific language/API version mapping and disable jdeps emission in the upgraded rules_kotlin archive. Use the upstream 2.4.21 module definition and registry version directly, without an extra version-rewrite patch.

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

Author: jketema

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",
     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

@@ -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]

…rules_kotlin/2.2.2-codeql.1/MODULE.bazel …modules/rules_kotlin/2.4.21/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/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/MODULE.bazel

@@ -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"],
- )
-

misc/bazel/registry/modules/rules_kotlin/2.4.21/patches/codeql_add_language_version_option.patch

@@ -0,0 +1,9 @@
+{
+    "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_add_language_version_option.patch": "sha256-3ge9oiBmjhY7qPhYZpuN8E1e2Bv0ntsVpy98WOJv2To=",
+        "codeql_do_not_emit_jdeps.patch": "sha256-nS1N5h/nA2+y5nIdkdRxHGfp+m/EKq4B5UQF6DXzcYs="
+    },
+    "patch_strip": 1
+}

…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/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/patches/codeql_do_not_emit_jdeps.patch

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