diff options
| author |  cushon <cushon@google.com> | 2018-04-25 13:01:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-25 13:02:17 -0700 |
| commit | 032141d73da0b4f24395155f597e9fa5f6298dc3 (patch) | |
| tree | 90da7b883fbe1aec356a498b056ec35b1bb548ce | |
| parent | 8ab09072ef45f0f5a60d77451a2e3a573c9c4c1c (diff) | |
Remove some references to JDK 7, which is not longer supported
PiperOrigin-RevId: 194284627
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 24 | ||||
| -rwxr-xr-x | src/test/shell/bazel/bazel_bootstrap_distfile_test.sh | 5 | ||||
| -rwxr-xr-x | src/test/shell/bazel/bazel_example_test.sh | 4 |
3 files changed, 7 insertions, 26 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index 57b5332863..61d4f71910 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -31,23 +31,13 @@ fi : ${JAVA_VERSION:="1.8"} -if [ "${JAVA_VERSION}" = "1.7" ]; then - _BAZEL_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain_jdk7 \ - --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain_jdk7 \ - --spawn_strategy=standalone \ - --nojava_header_compilation \ - --define JAVA_VERSION=1.7 --ignore_unsupported_sandboxing \ - --compilation_mode=opt \ - ${EXTRA_BAZEL_ARGS:-}" -else - _BAZEL_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ - --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ - --spawn_strategy=standalone \ - --nojava_header_compilation \ - --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \ - --compilation_mode=opt \ - ${EXTRA_BAZEL_ARGS:-}" -fi +_BAZEL_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ + --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ + --spawn_strategy=standalone \ + --nojava_header_compilation \ + --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \ + --compilation_mode=opt \ + ${EXTRA_BAZEL_ARGS:-}" if [ -z "${BAZEL-}" ]; then function _run_bootstrapping_bazel() { diff --git a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh index 783ed88a7d..3f4dd06efa 100755 --- a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh +++ b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh @@ -21,11 +21,6 @@ set -u DISTFILE=$(rlocation io_bazel/${1#./}) shift 1 -if [ "${JAVA_VERSION:-}" == "1.7" ] ; then - echo "Warning: bootstrapping not tested for java 1.7" - exit 0 -fi - # Load the test setup defined in the parent directory source $(rlocation io_bazel/src/test/shell/integration_test_setup.sh) \ || { echo "integration_test_setup.sh not found!" >&2; exit 1; } diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh index 4d7a1655be..cd695c4711 100755 --- a/src/test/shell/bazel/bazel_example_test.sh +++ b/src/test/shell/bazel/bazel_example_test.sh @@ -67,10 +67,6 @@ function test_java_test() { assert_build "-- //examples/java-native/... -${java_native_main}:hello-error-prone" JAVA_VERSION="1.$(bazel query --output=build '@bazel_tools//tools/jdk:toolchain' | grep source_version | cut -d '"' -f 2)" - if [ "${JAVA_VERSION}" -ne "1.7" ]; then - assert_build_fails "${java_native_main}:hello-error-prone" \ - "Did you mean 'result = b == -1;'?" - fi assert_test_ok "${java_native_tests}:hello" assert_test_ok "${java_native_tests}:custom" assert_test_fails "${java_native_tests}:fail" |