Skip to content

Commit b012cb5

Browse files
committed
Update rules_kotlin to v2.3.10
1 parent 5d74ad5 commit b012cb5

File tree

7 files changed

+21
-26
lines changed

7 files changed

+21
-26
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bazel_dep(name = "bazel_skylib", version = "1.8.1")
2626
bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")
2727
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2828
bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
29-
bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1")
29+
bazel_dep(name = "rules_kotlin", version = "2.3.10.codeql.1")
3030
bazel_dep(name = "gazelle", version = "0.47.0")
3131
bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
3232
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel renamed to misc/bazel/registry/modules/rules_kotlin/2.3.10.codeql.1/MODULE.bazel

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "rules_kotlin",
3-
version = "2.2.2-codeql.1",
3+
version = "2.3.10.codeql.1",
44
compatibility_level = 1,
55
repo_name = "rules_kotlin",
66
)
@@ -9,13 +9,8 @@ bazel_dep(name = "platforms", version = "0.0.11")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "rules_java", version = "8.9.0")
1111
bazel_dep(name = "rules_android", version = "0.6.4")
12-
bazel_dep(name = "bazel_features", version = "1.25.0")
13-
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
14-
bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
15-
bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
16-
bazel_dep(name = "rules_cc", version = "0.0.16")
17-
bazel_dep(name = "bazel_worker_api", version = "0.0.8")
18-
bazel_dep(name = "bazel_worker_java", version = "0.0.8")
12+
bazel_dep(name = "bazel_features", version = "1.39.0")
13+
bazel_dep(name = "bazel_lib", version = "3.1.0")
1914

2015
rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
2116
use_repo(rules_java_toolchains, "remote_java_tools")

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
--- a/src/main/starlark/core/options/opts.kotlinc.bzl 2000-01-01 01:00:00.000000000 +0100
2-
+++ b/src/main/starlark/core/options/opts.kotlinc.bzl 2025-11-17 16:51:01.012063056 +0100
1+
--- a/src/main/starlark/core/options/opts.kotlinc.bzl
2+
+++ b/src/main/starlark/core/options/opts.kotlinc.bzl
33
@@ -51,6 +51,11 @@
44
return None
55
return ["-Xjdk-release=%s" % version]
6-
6+
77
+def _map_language_version_to_flag(version):
88
+ if not version:
99
+ return None
@@ -12,7 +12,7 @@
1212
_KOPTS_ALL = {
1313
"include_stdlibs": struct(
1414
args = dict(
15-
@@ -495,6 +500,15 @@
15+
@@ -521,6 +526,15 @@
1616
value_to_flag = None,
1717
map_value_to_flag = _map_warning_level,
1818
),
@@ -26,5 +26,5 @@
2626
+ map_value_to_flag = _map_language_version_to_flag,
2727
+ ),
2828
}
29-
29+
3030
def _merge(key, rule_defined):

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.3.10.codeql.1/patches/codeql_do_not_emit_jdeps.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ allows us to not have to specify that option (and therefore pull in `rules_kotli
44
internal repo.
55
--- a/kotlin/settings/BUILD.bazel
66
+++ b/kotlin/settings/BUILD.bazel
7-
@@ -16,6 +16,6 @@ release_archive(
7+
@@ -16,7 +16,7 @@
88
# Flag that controls the emission of jdeps files during kotlin jvm compilation.
99
bool_flag(
1010
name = "jvm_emit_jdeps",
1111
- build_setting_default = True, # Upstream default behavior
1212
+ build_setting_default = False,
1313
visibility = ["//visibility:public"],
1414
)
15-
15+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrity": "sha256-yP2isVGAGPJtfKkUzZrbDp8XmdDbfEtRDeZ+1QAGDa4=",
3+
"url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.3.10/rules_kotlin-v2.3.10.tar.gz",
4+
"patches": {
5+
"codeql_add_language_version_option.patch": "sha256-YXp0SObW7zNjXmd5ONJTCXJeOvgkMGPxmGo9aRS7VZ0=",
6+
"codeql_do_not_emit_jdeps.patch": "sha256-yoBFnSWJyeF+gyhX+03TMTnRxUQJjup/f/KORdxVsAE="
7+
},
8+
"patch_strip": 1
9+
}

misc/bazel/registry/modules/rules_kotlin/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"github:bazelbuild/rules_kotlin"
2222
],
2323
"versions": [
24-
"2.2.2-codeql.1"
24+
"2.3.10.codeql.1"
2525
],
2626
"yanked_versions": {}
2727
}

0 commit comments

Comments
 (0)