Skip to content

Commit 89b7cae

Browse files
jketemaCopilot
andcommitted
Restore standard context in rules_kotlin patches
Include three unchanged lines before and after each customization so the registry patches remain readable and match normal unified diffs. Refresh the patch integrity hashes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9bc9288 commit 89b7cae

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
--- a/src/main/starlark/core/options/opts.kotlinc.bzl
22
+++ b/src/main/starlark/core/options/opts.kotlinc.bzl
3-
@@ -97,3 +97,3 @@
3+
@@ -95,7 +95,7 @@
4+
return None
5+
if int(version.split(".")[0]) < 2:
46
fail("rules_kotlin requires language_version 2.0 or newer; got %s" % version)
57
- return ["-language-version=%s" % version]
68
+ return ["-language-version=%s" % version, "-api-version=%s" % version]
79

10+
def _map_xxlanguage_to_flag(values):
11+
return ["-XXLanguage:%s" % v for v in values]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +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-
@@ -18,3 +18,3 @@
7+
@@ -16,7 +16,7 @@
8+
# Flag that controls the emission of jdeps files during kotlin jvm compilation.
9+
bool_flag(
810
name = "jvm_emit_jdeps",
911
- build_setting_default = True, # Upstream default behavior
1012
+ build_setting_default = False,
1113
visibility = ["//visibility:public"],
14+
)
15+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"integrity": "sha256-qjJVRS2+m1LaK6d4fwhl8QeAWIUQnznD1br8IaUhvLY=",
33
"url": "https://github.com/bazel-contrib/rules_kotlin/releases/download/v2.4.21/rules_kotlin-v2.4.21.tar.gz",
44
"patches": {
5-
"codeql_add_language_version_option.patch": "sha256-jj307smT4JoCJDHTl8yL7fQzcKiyltQ9mUKPOjNp0J0=",
6-
"codeql_do_not_emit_jdeps.patch": "sha256-L+VCVw7tPpxqR/xBDJW7UsCrcEhsbqpwT3tUJL5s/P8="
5+
"codeql_add_language_version_option.patch": "sha256-OH7z5HrY41V3g++D/4quJh+R+dvhsquPdaT5zlBiQjo=",
6+
"codeql_do_not_emit_jdeps.patch": "sha256-yoBFnSWJyeF+gyhX+03TMTnRxUQJjup/f/KORdxVsAE="
77
},
88
"patch_strip": 1
99
}

0 commit comments

Comments
 (0)