Skip to content
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

Default java toolchain target #8569

Closed
wants to merge 5 commits into from
Closed

Default java toolchain target #8569

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa6ed31
Add {source,target}_version
iirina Jun 6, 2019
e61b88d
Add test.
iirina Jun 6, 2019
90a6190
Move the test to another shell test that doesn't run with different j…
iirina Jun 6, 2019
a9e599b
Revert changes to src/test/shell/bazel/bazel_java_test.sh
iirina Jun 6, 2019
d131b70
Disable the test for java 9 and 10 because the default java toolchain…
iirina Jun 6, 2019
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
31 changes: 31 additions & 0 deletions src/test/shell/bazel/bazel_java_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,4 +1727,35 @@ EOF
bazel build java/com/google/foo:my_skylark_rule >& "$TEST_log" || fail "Expected success"
}

function test_default_java_toolchain_target_version() {
mkdir -p java/main
cat >java/main/BUILD <<EOF
java_binary(
name = 'JavaBinary',
srcs = ['JavaBinary.java'],
main_class = 'JavaBinary',
)
load(
"@bazel_tools//tools/jdk:default_java_toolchain.bzl",
"default_java_toolchain",
)
default_java_toolchain(
name = "default_toolchain",
visibility = ["//visibility:public"],
)
EOF

cat >java/main/JavaBinary.java <<EOF
public class JavaBinary {
public static void main(String[] args) {
System.out.println("Successfully executed JavaBinary!");
}
}
EOF
bazel run java/main:JavaBinary --java_toolchain=//java/main:default_toolchain --verbose_failures -s &>"${TEST_log}"
expect_log "Successfully executed JavaBinary!"
javap -verbose -cp bazel-bin/java/main/JavaBinary.jar JavaBinary | grep major &>"${TEST_log}"
expect_log "major version: 52"
}

run_suite "Java integration tests"
2 changes: 2 additions & 0 deletions tools/jdk/default_java_toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
"compatible_javacopts": COMPATIBLE_JAVACOPTS,
"singlejar": ["@bazel_tools//tools/jdk:singlejar"],
"bootclasspath": ["@bazel_tools//tools/jdk:platformclasspath"],
"source_version": "8",
"target_version": "8",
}

def default_java_toolchain(name, **kwargs):
Expand Down