diff --git a/.travis.yml b/.travis.yml index a63c5ddef..09da269d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,9 @@ os: env: # we want to test the last release - - V=0.11.1 TEST_SCRIPT=test_rules_scala.sh - - V=0.11.1 TEST_SCRIPT=test_intellij_aspect.sh - - V=0.11.1 TEST_SCRIPT=test_reproducibility.sh + - V=0.12.0 TEST_SCRIPT=test_rules_scala.sh + - V=0.12.0 TEST_SCRIPT=test_intellij_aspect.sh + - V=0.12.0 TEST_SCRIPT=test_reproducibility.sh before_install: - | diff --git a/test_rules_scala.sh b/test_rules_scala.sh index 4e44cc3ce..91482b1a3 100755 --- a/test_rules_scala.sh +++ b/test_rules_scala.sh @@ -150,9 +150,11 @@ test_scala_library_expect_failure_on_missing_direct_deps_warn_mode() { test_scala_library_expect_failure_on_missing_direct_java() { dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency' + #since bazel 0.12.0 the labels are only emmitted if ijar is in play + dependency_file='test_expect_failure/missing_direct_deps/internal_deps/transitive_dependency_ijar.jar' test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user' - expected_message="$dependency_target[ \t]*to[ \t]*$test_target" + expected_message="$dependency_file.*$test_target" test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" $test_target "--strict_java_deps=error" } @@ -169,9 +171,10 @@ test_scala_library_expect_better_failure_message_on_missing_transitive_dependenc test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java() { dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency' + dependency_file='test_expect_failure/missing_direct_deps/internal_deps/transitive_dependency_ijar.jar' test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user' - local expected_message="buildozer 'add deps $dependency_target ' $test_target" + local expected_message="$dependency_file.*$test_target" test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" ${test_target} "--strict_java_deps=warn" "ne" }