Skip to content

Commit 0ad89f6

Browse files
authored
Strict deps java cmd line flag (#320)
strict_java_deps for java can be configured via command line removed bazel versions 0.5.3 and 0.5.4 from travis supported versions since above feature mandates 0.6.0 onwards
1 parent af6db2d commit 0ad89f6

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ os:
1212

1313
env:
1414
# we want to test the most recent few releases
15-
- V=0.5.3
16-
- V=0.5.4
1715
- V=0.6.0
1816

1917
before_install:

scala/scala.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ def try_to_compile_java_jar(ctx,
314314
exports = [],
315315
java_toolchain = ctx.attr._java_toolchain,
316316
host_javabase = ctx.attr._host_javabase,
317+
strict_deps = ctx.fragments.java.strict_java_deps,
317318
)
318319
return struct(jar = full_java_jar, ijar = provider.compile_jars.to_list().pop())
319320

test_run.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,15 @@ test_scala_library_expect_failure_on_missing_direct_java() {
170170
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" $test_target "--strict_java_deps=error"
171171
}
172172

173+
test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java() {
174+
dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency'
175+
test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'
176+
177+
local expected_message="buildozer 'add deps $dependency_target ' $test_target"
178+
179+
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" ${test_target} "--strict_java_deps=warn" "ne"
180+
}
181+
173182
test_scala_library_expect_failure_on_missing_direct_deps_off_mode() {
174183
expected_message="test_expect_failure/missing_direct_deps/internal_deps/A.scala:[0-9+]: error: not found: value C"
175184
test_target='test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_user'
@@ -583,3 +592,4 @@ $runner test_scala_library_expect_no_recompilation_on_internal_change_of_java_de
583592
$runner test_scala_library_expect_no_java_recompilation_on_internal_change_of_scala_sibling
584593
$runner test_scala_library_expect_failure_on_missing_direct_java
585594
$runner bazel run test:test_scala_proto_server
595+
$runner test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java

0 commit comments

Comments
 (0)