Skip to content

Commit 9bc9288

Browse files
jketemaCopilot
andcommitted
Add context to rules_kotlin upgrade patches
Keep the CodeQL language/API-version and jdeps customizations as contextual unified diffs, and refresh their registry hashes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent eda857e commit 9bc9288

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--- a/src/main/starlark/core/options/opts.kotlinc.bzl
22
+++ b/src/main/starlark/core/options/opts.kotlinc.bzl
3-
@@ -98 +98 @@
3+
@@ -97,3 +97,3 @@
4+
fail("rules_kotlin requires language_version 2.0 or newer; got %s" % version)
45
- return ["-language-version=%s" % version]
56
+ return ["-language-version=%s" % version, "-api-version=%s" % version]
7+

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ 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-
@@ -19 +19 @@
7+
@@ -18,3 +18,3 @@
8+
name = "jvm_emit_jdeps",
89
- build_setting_default = True, # Upstream default behavior
910
+ build_setting_default = False,
11+
visibility = ["//visibility:public"],

‎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-3ge9oiBmjhY7qPhYZpuN8E1e2Bv0ntsVpy98WOJv2To=",
6-
"codeql_do_not_emit_jdeps.patch": "sha256-nS1N5h/nA2+y5nIdkdRxHGfp+m/EKq4B5UQF6DXzcYs="
5+
"codeql_add_language_version_option.patch": "sha256-jj307smT4JoCJDHTl8yL7fQzcKiyltQ9mUKPOjNp0J0=",
6+
"codeql_do_not_emit_jdeps.patch": "sha256-L+VCVw7tPpxqR/xBDJW7UsCrcEhsbqpwT3tUJL5s/P8="
77
},
88
"patch_strip": 1
99
}

0 commit comments

Comments
 (0)