Skip to content

Add runtime_jdk to scala_binary #1380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2022
Merged

Add runtime_jdk to scala_binary #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2c6f2e
Add runtime_jdk to scala_binary
Apr 5, 2022
4858314
Remove runtime_jdk=...jdk8 test
Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scala/private/rules/scala_binary.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ _scala_binary_attrs = {
"main_class": attr.string(mandatory = True),
"classpath_resources": attr.label_list(allow_files = True),
"jvm_flags": attr.string_list(),
"runtime_jdk": attr.label(
default = Label("@bazel_tools//tools/jdk:current_java_runtime"),
providers = [java_common.JavaRuntimeInfo],
),
}

_scala_binary_attrs.update(launcher_template)
Expand Down
9 changes: 9 additions & 0 deletions test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,17 @@ scala_specs2_junit_test(
"//test/src/main/scala/scalarules/test/twitter_scrooge:justscrooge2b_binary",
"//test/src/main/scala/scalarules/test/large_classpath:largeClasspath",
"//test:test_scala_proto_server",
"//test:scala_binary_jdk_11",
]]

# Make sure scala_binary respects runtime_jdk on bazel run
scala_binary(
name = "scala_binary_jdk_11",
Copy link
Contributor

@wisechengyi wisechengyi Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Win! Could you see if we can add bazel run <this target> to somewhere like this as a test? https://github.com/bazelbuild/rules_scala/blob/master/test_rules_scala.sh

possibly test/shell/test_scala_binary.sh?

Copy link
Contributor Author

@wiwa wiwa Apr 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This target is added to the list of sh_tests above, so it will be run as a test.

Copy link
Contributor

@wisechengyi wisechengyi Apr 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh ok. missed that. thank you!

srcs = ["ScalaBinaryJdk11.scala"],
main_class = "scalarules.test.ScalaBinaryJdk11",
runtime_jdk = "@bazel_tools//tools/jdk:remote_jdk11",
)

# Generate a file containing the rootpaths of a Scala binary.
genrule(
name = "rootpath-script",
Expand Down
11 changes: 11 additions & 0 deletions test/ScalaBinaryJdk11.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package scalarules.test

object ScalaBinaryJdk11 {
def main(args: Array[String]): Unit = {
val expectedMajorVersion = "11";
val version = System.getProperty("java.version");
val majorVersionMatches = version.startsWith(expectedMajorVersion + ".");
val failureMsg = "Expected major version of " + expectedMajorVersion + " but got version: " + version;
require(majorVersionMatches, failureMsg);
}
}