Kotlin/Bazel: fix java release to 8 for java code

redsun82 · redsun82 · commit 8c705adbe99e · 2024-04-15T15:38:06.000+02:00
diff --git a/java/kotlin-extractor/BUILD.bazel b/java/kotlin-extractor/BUILD.bazel
@@ -31,7 +31,7 @@ load(
     "version_less",
 )
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
-load("@rules_kotlin//kotlin:core.bzl", "kt_kotlinc_options")
+load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")
 
 package(default_visibility = ["//java/kotlin-extractor:__subpackages__"])
 
@@ -57,6 +57,11 @@ _resources = [
     for r in glob(["src/main/resources/**"])
 ]
 
+kt_javac_options(
+    name = "javac-options",
+    release = "8",
+)
+
 [
     (
         kt_kotlinc_options(
@@ -102,6 +107,7 @@ _resources = [
                     ],
                     exclude = ["src/main/kotlin/utils/versions/**"],
                 ) + get_compatilibity_sources(v, "src/main/kotlin/utils/versions"),
+            javac_opts = ":javac-options",
             kotlinc_opts = ":kotlinc-options-%s" % v,
             module_name = "codeql-kotlin-extractor",
             # resource_strip_prefix is very nit-picky: the following makes it work from

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ load(`
`31`	`31`	`"version_less",`
`32`	`32`	`)`
`33`	`33`	`load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")`
`34`		`-load("@rules_kotlin//kotlin:core.bzl", "kt_kotlinc_options")`
	`34`	`+load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")`
`35`	`35`
`36`	`36`	`package(default_visibility = ["//java/kotlin-extractor:__subpackages__"])`
`37`	`37`
`@@ -57,6 +57,11 @@ _resources = [`
`57`	`57`	`for r in glob(["src/main/resources/**"])`
`58`	`58`	`]`
`59`	`59`
	`60`	`+kt_javac_options(`
	`61`	`+ name = "javac-options",`
	`62`	`+ release = "8",`
	`63`	`+)`
	`64`	`+`
`60`	`65`	`[`
`61`	`66`	`(`
`62`	`67`	`kt_kotlinc_options(`
`@@ -102,6 +107,7 @@ _resources = [`
`102`	`107`	`],`
`103`	`108`	`exclude = ["src/main/kotlin/utils/versions/**"],`
`104`	`109`	`) + get_compatilibity_sources(v, "src/main/kotlin/utils/versions"),`
	`110`	`+ javac_opts = ":javac-options",`
`105`	`111`	`kotlinc_opts = ":kotlinc-options-%s" % v,`
`106`	`112`	`module_name = "codeql-kotlin-extractor",`
`107`	`113`	`# resource_strip_prefix is very nit-picky: the following makes it work from`