From b012cb5c371b89da302d1d591c0b5b5dc06b3694 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Mon, 9 Mar 2026 17:13:42 +0100 Subject: [PATCH] Update `rules_kotlin` to v2.3.10 --- MODULE.bazel | 2 +- .../modules/rules_kotlin/2.2.2-codeql.1/source.json | 9 --------- .../{2.2.2-codeql.1 => 2.3.10.codeql.1}/MODULE.bazel | 11 +++-------- .../patches/codeql_add_language_version_option.patch | 10 +++++----- .../patches/codeql_do_not_emit_jdeps.patch | 4 ++-- .../modules/rules_kotlin/2.3.10.codeql.1/source.json | 9 +++++++++ .../bazel/registry/modules/rules_kotlin/metadata.json | 2 +- 7 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json rename misc/bazel/registry/modules/rules_kotlin/{2.2.2-codeql.1 => 2.3.10.codeql.1}/MODULE.bazel (65%) rename misc/bazel/registry/modules/rules_kotlin/{2.2.2-codeql.1 => 2.3.10.codeql.1}/patches/codeql_add_language_version_option.patch (77%) rename misc/bazel/registry/modules/rules_kotlin/{2.2.2-codeql.1 => 2.3.10.codeql.1}/patches/codeql_do_not_emit_jdeps.patch (94%) create mode 100644 misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/source.json diff --git a/MODULE.bazel b/MODULE.bazel index 2b37719584cd..4f97c5b1defc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep(name = "bazel_skylib", version = "1.8.1") bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl") bazel_dep(name = "nlohmann_json", version = "3.11.3", 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.3.10.codeql.1") bazel_dep(name = "gazelle", version = "0.47.0") bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1") bazel_dep(name = "googletest", version = "1.14.0.bcr.1") diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json deleted file mode 100644 index 7025fb00a273..000000000000 --- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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 -} diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/MODULE.bazel similarity index 65% rename from misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel rename to misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/MODULE.bazel index ec37914a8f73..ff563e47ed2f 100644 --- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel +++ b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "rules_kotlin", - version = "2.2.2-codeql.1", + version = "2.3.10.codeql.1", compatibility_level = 1, repo_name = "rules_kotlin", ) @@ -9,13 +9,8 @@ bazel_dep(name = "platforms", version = "0.0.11") bazel_dep(name = "bazel_skylib", version = "1.7.1") 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 = "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") diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/patches/codeql_add_language_version_option.patch similarity index 77% rename from misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch rename to misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/patches/codeql_add_language_version_option.patch index 795d1f88f387..c1181af06367 100644 --- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch +++ b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/patches/codeql_add_language_version_option.patch @@ -1,9 +1,9 @@ ---- 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 +--- a/src/main/starlark/core/options/opts.kotlinc.bzl ++++ b/src/main/starlark/core/options/opts.kotlinc.bzl @@ -51,6 +51,11 @@ return None return ["-Xjdk-release=%s" % version] - + +def _map_language_version_to_flag(version): + if not version: + return None @@ -12,7 +12,7 @@ _KOPTS_ALL = { "include_stdlibs": struct( args = dict( -@@ -495,6 +500,15 @@ +@@ -521,6 +526,15 @@ value_to_flag = None, map_value_to_flag = _map_warning_level, ), @@ -26,5 +26,5 @@ + map_value_to_flag = _map_language_version_to_flag, + ), } - + def _merge(key, rule_defined): diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/patches/codeql_do_not_emit_jdeps.patch similarity index 94% rename from misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch rename to misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/patches/codeql_do_not_emit_jdeps.patch index 838750ba12eb..aeda6be2c569 100644 --- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch +++ b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/patches/codeql_do_not_emit_jdeps.patch @@ -4,7 +4,7 @@ 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( +@@ -16,7 +16,7 @@ # Flag that controls the emission of jdeps files during kotlin jvm compilation. bool_flag( name = "jvm_emit_jdeps", @@ -12,4 +12,4 @@ internal repo. + build_setting_default = False, visibility = ["//visibility:public"], ) - + diff --git a/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/source.json new file mode 100644 index 000000000000..fbd293d10864 --- /dev/null +++ b/misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/source.json @@ -0,0 +1,9 @@ +{ + "integrity": "sha256-yP2isVGAGPJtfKkUzZrbDp8XmdDbfEtRDeZ+1QAGDa4=", + "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.3.10/rules_kotlin-v2.3.10.tar.gz", + "patches": { + "codeql_add_language_version_option.patch": "sha256-YXp0SObW7zNjXmd5ONJTCXJeOvgkMGPxmGo9aRS7VZ0=", + "codeql_do_not_emit_jdeps.patch": "sha256-yoBFnSWJyeF+gyhX+03TMTnRxUQJjup/f/KORdxVsAE=" + }, + "patch_strip": 1 +} diff --git a/misc/bazel/registry/modules/rules_kotlin/metadata.json b/misc/bazel/registry/modules/rules_kotlin/metadata.json index ea756f783643..3bd56c19a2d5 100644 --- a/misc/bazel/registry/modules/rules_kotlin/metadata.json +++ b/misc/bazel/registry/modules/rules_kotlin/metadata.json @@ -21,7 +21,7 @@ "github:bazelbuild/rules_kotlin" ], "versions": [ - "2.2.2-codeql.1" + "2.3.10.codeql.1" ], "yanked_versions": {} }