Adding workaround patch to pin toolchain by default to jdk 11

uber-common · Oct 25, 2023 · cf503d0 · cf503d0
1 parent 2078ee1
commit cf503d0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/distdir_deps.bzl b/distdir_deps.bzl
@@ -74,6 +74,10 @@ DIST_DEPS = {
         "used_in": [
             "additional_distfiles",
         ],
+        "patch_args": ["-p1"],
+        "patches": [
+            "//third_party/java:rules_java.patch",
+        ],
         "license_kinds": [
             "@rules_license//licenses/spdx:Apache-2.0",
         ],

diff --git a/third_party/java/BUILD b/third_party/java/BUILD
@@ -0,0 +1,7 @@
+licenses(["notice"])
+
+filegroup(
+    name = "patch",
+    srcs = glob([rules_java.path]),  # glob everything to satisfy the compile.sh srcs test
+    visibility = ["//third_party:__pkg__"],
+)
diff --git a/third_party/java/rules_java.patch b/third_party/java/rules_java.patch
@@ -0,0 +1,12 @@
+diff --git a/toolchains/BUILD b/toolchains/BUILD
+index b8cb35d..25f03ed 100644
+--- a/toolchains/BUILD
++++ b/toolchains/BUILD
+@@ -224,6 +224,7 @@ RELEASES = (8, 9, 10, 11)
+         configuration = DEFAULT_TOOLCHAIN_CONFIGURATION,
+         source_version = "%s" % release,
+         target_version = "%s" % release,
++        java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
+     )
+     for release in RELEASES
+ ]