Upgrade zinc to 1 4 0

.bazelrc

@@ -1,3 +1,2 @@
 common       --config=rules
-common:v2.2 --config=rules_v2.2
 import %workspace%/.bazelrc_shared

.bazelrc_shared

@@ -14,16 +14,15 @@ test  --test_output=all
 build:rules --disk_cache=.bazel_cache
 build:tests --disk_cache=../.bazel_cache
 
-# bazel 2.2.0
-common:rules_v2.1 --config=noop
-common:rules_v2.2 --config=noop
+common:rules_v3.2 --config=noop
+common:rules_v3.3 --config=noop
 
 # route potentially unrouted configs to a terminating noop config
 # it's a noop because we use the default value
 common:rules --config=noop
 common:tests --config=noop
-common:v2.1 --config=rules_v2.1
-common:v2.2 --config=rules_v2.2
+common:v3.2 --config=rules_v3.2
+common:v3.3 --config=rules_v3.3
 
 # pick something trivial as a "noop"
 common:noop --logging=3

.travis.yml

@@ -28,36 +28,36 @@ jobs:
 # Build
     - stage: build
       <<: *osx
-      env: BAZEL_VERSION=2.1.0
+      env: BAZEL_VERSION=3.2.0
       script: ./scripts/travis.sh build
     - <<: *linux
-      env: BAZEL_VERSION=2.1.0
+      env: BAZEL_VERSION=3.2.0
       script: ./scripts/travis.sh build
     - <<: *osx
-      env: BAZEL_VERSION=2.2.0
+      env: BAZEL_VERSION=3.3.0
       script: ./scripts/travis.sh build
     - <<: *linux
-      env: BAZEL_VERSION=2.2.0
+      env: BAZEL_VERSION=3.3.0
       script: ./scripts/travis.sh build
 # Lint
     - stage: lint
       <<: *osx
-      env: BAZEL_VERSION=2.1.0
+      env: BAZEL_VERSION=3.2.0
       script: ./scripts/travis.sh lint
     - <<: *linux
-      env: BAZEL_VERSION=2.2.0
+      env: BAZEL_VERSION=3.3.0
       script: ./scripts/travis.sh lint
 # Test
     - stage: test
       <<: *osx
-      env: BAZEL_VERSION=2.1.0
+      env: BAZEL_VERSION=3.2.0
       script: ./scripts/travis.sh test
     - <<: *linux
-      env: BAZEL_VERSION=2.1.0
+      env: BAZEL_VERSION=3.2.0
       script: ./scripts/travis.sh test
     - <<: *osx
-      env: BAZEL_VERSION=2.2.0
+      env: BAZEL_VERSION=3.3.0
       script: ./scripts/travis.sh test
     - <<: *linux
-      env: BAZEL_VERSION=2.2.0
+      env: BAZEL_VERSION=3.3.0
       script: ./scripts/travis.sh test

docs/stardoc/scala.md

@@ -72,7 +72,7 @@ configure_bootstrap_scala(<a href="#configure_bootstrap_scala-name">name</a>, <a
 ## scala_binary
 
 <pre>
-scala_binary(<a href="#scala_binary-name">name</a>, <a href="#scala_binary-data">data</a>, <a href="#scala_binary-deps">deps</a>, <a href="#scala_binary-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_binary-javacopts">javacopts</a>, <a href="#scala_binary-jvm_flags">jvm_flags</a>, <a href="#scala_binary-main_class">main_class</a>, <a href="#scala_binary-plugins">plugins</a>, <a href="#scala_binary-resource_jars">resource_jars</a>, <a href="#scala_binary-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_binary-resources">resources</a>, <a href="#scala_binary-runtime_deps">runtime_deps</a>, <a href="#scala_binary-scala">scala</a>, <a href="#scala_binary-scalacopts">scalacopts</a>, <a href="#scala_binary-srcs">srcs</a>)
+scala_binary(<a href="#scala_binary-name">name</a>, <a href="#scala_binary-data">data</a>, <a href="#scala_binary-deps">deps</a>, <a href="#scala_binary-deps_unused_whitelist">deps_unused_whitelist</a>, <a href="#scala_binary-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_binary-javacopts">javacopts</a>, <a href="#scala_binary-jvm_flags">jvm_flags</a>, <a href="#scala_binary-main_class">main_class</a>, <a href="#scala_binary-plugins">plugins</a>, <a href="#scala_binary-resource_jars">resource_jars</a>, <a href="#scala_binary-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_binary-resources">resources</a>, <a href="#scala_binary-runtime_deps">runtime_deps</a>, <a href="#scala_binary-scala">scala</a>, <a href="#scala_binary-scalacopts">scalacopts</a>, <a href="#scala_binary-srcs">srcs</a>)
 </pre>
 
 
@@ -122,6 +122,15 @@ To run the program: `bazel run <target>`
         </p>
       </td>
     </tr>
+    <tr id="scala_binary-deps_unused_whitelist">
+      <td><code>deps_unused_whitelist</code></td>
+      <td>
+        <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a>; optional
+        <p>
+          The JVM library dependencies to always consider unused for `scala_deps_direct` checks.
+        </p>
+      </td>
+    </tr>
     <tr id="scala_binary-deps_used_whitelist">
       <td><code>deps_used_whitelist</code></td>
       <td>
@@ -311,7 +320,7 @@ Use this only for libraries with macros. Otherwise, use `java_import`.
 ## scala_library
 
 <pre>
-scala_library(<a href="#scala_library-name">name</a>, <a href="#scala_library-data">data</a>, <a href="#scala_library-deps">deps</a>, <a href="#scala_library-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_library-exports">exports</a>, <a href="#scala_library-javacopts">javacopts</a>, <a href="#scala_library-macro">macro</a>, <a href="#scala_library-neverlink">neverlink</a>, <a href="#scala_library-plugins">plugins</a>, <a href="#scala_library-resource_jars">resource_jars</a>, <a href="#scala_library-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_library-resources">resources</a>, <a href="#scala_library-runtime_deps">runtime_deps</a>, <a href="#scala_library-scala">scala</a>, <a href="#scala_library-scalacopts">scalacopts</a>, <a href="#scala_library-srcs">srcs</a>)
+scala_library(<a href="#scala_library-name">name</a>, <a href="#scala_library-data">data</a>, <a href="#scala_library-deps">deps</a>, <a href="#scala_library-deps_unused_whitelist">deps_unused_whitelist</a>, <a href="#scala_library-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_library-exports">exports</a>, <a href="#scala_library-javacopts">javacopts</a>, <a href="#scala_library-macro">macro</a>, <a href="#scala_library-neverlink">neverlink</a>, <a href="#scala_library-plugins">plugins</a>, <a href="#scala_library-resource_jars">resource_jars</a>, <a href="#scala_library-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_library-resources">resources</a>, <a href="#scala_library-runtime_deps">runtime_deps</a>, <a href="#scala_library-scala">scala</a>, <a href="#scala_library-scalacopts">scalacopts</a>, <a href="#scala_library-srcs">srcs</a>)
 </pre>
 
 Compiles a Scala JVM library.
@@ -351,6 +360,15 @@ Compiles a Scala JVM library.
         </p>
       </td>
     </tr>
+    <tr id="scala_library-deps_unused_whitelist">
+      <td><code>deps_unused_whitelist</code></td>
+      <td>
+        <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a>; optional
+        <p>
+          The JVM library dependencies to always consider unused for `scala_deps_direct` checks.
+        </p>
+      </td>
+    </tr>
     <tr id="scala_library-deps_used_whitelist">
       <td><code>deps_used_whitelist</code></td>
       <td>
@@ -555,7 +573,7 @@ To run: `bazel run <target>`
 ## scala_test
 
 <pre>
-scala_test(<a href="#scala_test-name">name</a>, <a href="#scala_test-data">data</a>, <a href="#scala_test-deps">deps</a>, <a href="#scala_test-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_test-frameworks">frameworks</a>, <a href="#scala_test-isolation">isolation</a>, <a href="#scala_test-javacopts">javacopts</a>, <a href="#scala_test-jvm_flags">jvm_flags</a>, <a href="#scala_test-plugins">plugins</a>, <a href="#scala_test-resource_jars">resource_jars</a>, <a href="#scala_test-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_test-resources">resources</a>, <a href="#scala_test-runner">runner</a>, <a href="#scala_test-runtime_deps">runtime_deps</a>, <a href="#scala_test-scala">scala</a>, <a href="#scala_test-scalacopts">scalacopts</a>, <a href="#scala_test-shared_deps">shared_deps</a>, <a href="#scala_test-srcs">srcs</a>, <a href="#scala_test-subprocess_runner">subprocess_runner</a>)
+scala_test(<a href="#scala_test-name">name</a>, <a href="#scala_test-data">data</a>, <a href="#scala_test-deps">deps</a>, <a href="#scala_test-deps_unused_whitelist">deps_unused_whitelist</a>, <a href="#scala_test-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_test-frameworks">frameworks</a>, <a href="#scala_test-isolation">isolation</a>, <a href="#scala_test-javacopts">javacopts</a>, <a href="#scala_test-jvm_flags">jvm_flags</a>, <a href="#scala_test-plugins">plugins</a>, <a href="#scala_test-resource_jars">resource_jars</a>, <a href="#scala_test-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_test-resources">resources</a>, <a href="#scala_test-runner">runner</a>, <a href="#scala_test-runtime_deps">runtime_deps</a>, <a href="#scala_test-scala">scala</a>, <a href="#scala_test-scalacopts">scalacopts</a>, <a href="#scala_test-shared_deps">shared_deps</a>, <a href="#scala_test-srcs">srcs</a>, <a href="#scala_test-subprocess_runner">subprocess_runner</a>)
 </pre>
 
 
@@ -604,6 +622,15 @@ To build and run a specific test: `bazel test <target> --test_filter=<filter_exp
         </p>
       </td>
     </tr>
+    <tr id="scala_test-deps_unused_whitelist">
+      <td><code>deps_unused_whitelist</code></td>
+      <td>
+        <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a>; optional
+        <p>
+          The JVM library dependencies to always consider unused for `scala_deps_direct` checks.
+        </p>
+      </td>
+    </tr>
     <tr id="scala_test-deps_used_whitelist">
       <td><code>deps_used_whitelist</code></td>
       <td>

docs/stardoc/scala_with_scalafmt.md

@@ -5,7 +5,7 @@
 ## scala_binary
 
 <pre>
-scala_binary(<a href="#scala_binary-name">name</a>, <a href="#scala_binary-config">config</a>, <a href="#scala_binary-data">data</a>, <a href="#scala_binary-deps">deps</a>, <a href="#scala_binary-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_binary-format">format</a>, <a href="#scala_binary-javacopts">javacopts</a>, <a href="#scala_binary-jvm_flags">jvm_flags</a>, <a href="#scala_binary-main_class">main_class</a>, <a href="#scala_binary-plugins">plugins</a>, <a href="#scala_binary-resource_jars">resource_jars</a>, <a href="#scala_binary-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_binary-resources">resources</a>, <a href="#scala_binary-runtime_deps">runtime_deps</a>, <a href="#scala_binary-scala">scala</a>, <a href="#scala_binary-scalacopts">scalacopts</a>, <a href="#scala_binary-srcs">srcs</a>)
+scala_binary(<a href="#scala_binary-name">name</a>, <a href="#scala_binary-config">config</a>, <a href="#scala_binary-data">data</a>, <a href="#scala_binary-deps">deps</a>, <a href="#scala_binary-deps_unused_whitelist">deps_unused_whitelist</a>, <a href="#scala_binary-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_binary-format">format</a>, <a href="#scala_binary-javacopts">javacopts</a>, <a href="#scala_binary-jvm_flags">jvm_flags</a>, <a href="#scala_binary-main_class">main_class</a>, <a href="#scala_binary-plugins">plugins</a>, <a href="#scala_binary-resource_jars">resource_jars</a>, <a href="#scala_binary-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_binary-resources">resources</a>, <a href="#scala_binary-runtime_deps">runtime_deps</a>, <a href="#scala_binary-scala">scala</a>, <a href="#scala_binary-scalacopts">scalacopts</a>, <a href="#scala_binary-srcs">srcs</a>)
 </pre>
 
 
@@ -64,6 +64,15 @@ To run the program: `bazel run <target>`
         </p>
       </td>
     </tr>
+    <tr id="scala_binary-deps_unused_whitelist">
+      <td><code>deps_unused_whitelist</code></td>
+      <td>
+        <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a>; optional
+        <p>
+          The JVM library dependencies to always consider unused for `scala_deps_direct` checks.
+        </p>
+      </td>
+    </tr>
     <tr id="scala_binary-deps_used_whitelist">
       <td><code>deps_used_whitelist</code></td>
       <td>
@@ -188,7 +197,7 @@ To run the program: `bazel run <target>`
 ## scala_library
 
 <pre>
-scala_library(<a href="#scala_library-name">name</a>, <a href="#scala_library-config">config</a>, <a href="#scala_library-data">data</a>, <a href="#scala_library-deps">deps</a>, <a href="#scala_library-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_library-exports">exports</a>, <a href="#scala_library-format">format</a>, <a href="#scala_library-javacopts">javacopts</a>, <a href="#scala_library-macro">macro</a>, <a href="#scala_library-neverlink">neverlink</a>, <a href="#scala_library-plugins">plugins</a>, <a href="#scala_library-resource_jars">resource_jars</a>, <a href="#scala_library-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_library-resources">resources</a>, <a href="#scala_library-runtime_deps">runtime_deps</a>, <a href="#scala_library-scala">scala</a>, <a href="#scala_library-scalacopts">scalacopts</a>, <a href="#scala_library-srcs">srcs</a>)
+scala_library(<a href="#scala_library-name">name</a>, <a href="#scala_library-config">config</a>, <a href="#scala_library-data">data</a>, <a href="#scala_library-deps">deps</a>, <a href="#scala_library-deps_unused_whitelist">deps_unused_whitelist</a>, <a href="#scala_library-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_library-exports">exports</a>, <a href="#scala_library-format">format</a>, <a href="#scala_library-javacopts">javacopts</a>, <a href="#scala_library-macro">macro</a>, <a href="#scala_library-neverlink">neverlink</a>, <a href="#scala_library-plugins">plugins</a>, <a href="#scala_library-resource_jars">resource_jars</a>, <a href="#scala_library-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_library-resources">resources</a>, <a href="#scala_library-runtime_deps">runtime_deps</a>, <a href="#scala_library-scala">scala</a>, <a href="#scala_library-scalacopts">scalacopts</a>, <a href="#scala_library-srcs">srcs</a>)
 </pre>
 
 Compiles a Scala JVM library.
@@ -237,6 +246,15 @@ Compiles a Scala JVM library.
         </p>
       </td>
     </tr>
+    <tr id="scala_library-deps_unused_whitelist">
+      <td><code>deps_unused_whitelist</code></td>
+      <td>
+        <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a>; optional
+        <p>
+          The JVM library dependencies to always consider unused for `scala_deps_direct` checks.
+        </p>
+      </td>
+    </tr>
     <tr id="scala_library-deps_used_whitelist">
       <td><code>deps_used_whitelist</code></td>
       <td>
@@ -370,7 +388,7 @@ Compiles a Scala JVM library.
 ## scala_test
 
 <pre>
-scala_test(<a href="#scala_test-name">name</a>, <a href="#scala_test-config">config</a>, <a href="#scala_test-data">data</a>, <a href="#scala_test-deps">deps</a>, <a href="#scala_test-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_test-format">format</a>, <a href="#scala_test-frameworks">frameworks</a>, <a href="#scala_test-isolation">isolation</a>, <a href="#scala_test-javacopts">javacopts</a>, <a href="#scala_test-jvm_flags">jvm_flags</a>, <a href="#scala_test-plugins">plugins</a>, <a href="#scala_test-resource_jars">resource_jars</a>, <a href="#scala_test-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_test-resources">resources</a>, <a href="#scala_test-runner">runner</a>, <a href="#scala_test-runtime_deps">runtime_deps</a>, <a href="#scala_test-scala">scala</a>, <a href="#scala_test-scalacopts">scalacopts</a>, <a href="#scala_test-shared_deps">shared_deps</a>, <a href="#scala_test-srcs">srcs</a>, <a href="#scala_test-subprocess_runner">subprocess_runner</a>)
+scala_test(<a href="#scala_test-name">name</a>, <a href="#scala_test-config">config</a>, <a href="#scala_test-data">data</a>, <a href="#scala_test-deps">deps</a>, <a href="#scala_test-deps_unused_whitelist">deps_unused_whitelist</a>, <a href="#scala_test-deps_used_whitelist">deps_used_whitelist</a>, <a href="#scala_test-format">format</a>, <a href="#scala_test-frameworks">frameworks</a>, <a href="#scala_test-isolation">isolation</a>, <a href="#scala_test-javacopts">javacopts</a>, <a href="#scala_test-jvm_flags">jvm_flags</a>, <a href="#scala_test-plugins">plugins</a>, <a href="#scala_test-resource_jars">resource_jars</a>, <a href="#scala_test-resource_strip_prefix">resource_strip_prefix</a>, <a href="#scala_test-resources">resources</a>, <a href="#scala_test-runner">runner</a>, <a href="#scala_test-runtime_deps">runtime_deps</a>, <a href="#scala_test-scala">scala</a>, <a href="#scala_test-scalacopts">scalacopts</a>, <a href="#scala_test-shared_deps">shared_deps</a>, <a href="#scala_test-srcs">srcs</a>, <a href="#scala_test-subprocess_runner">subprocess_runner</a>)
 </pre>
 
 
@@ -428,6 +446,15 @@ To build and run a specific test: `bazel test <target> --test_filter=<filter_exp
         </p>
       </td>
     </tr>
+    <tr id="scala_test-deps_unused_whitelist">
+      <td><code>deps_unused_whitelist</code></td>
+      <td>
+        <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a>; optional
+        <p>
+          The JVM library dependencies to always consider unused for `scala_deps_direct` checks.
+        </p>
+      </td>
+    </tr>
     <tr id="scala_test-deps_used_whitelist">
       <td><code>deps_used_whitelist</code></td>
       <td>

rules/external/third_party/bazel/tools/build_defs/repo/java.bzl

@@ -26,7 +26,7 @@ These import rules must have the following attributes:
 - "runtime_deps"
 - "exports"
 
-the code here is solely based on `jave_import_external` from bazelbuild/bazel repository and is proposed to be upstreamed back.
+the code here is solely based on `java_import_external` from bazelbuild/bazel repository and is proposed to be upstreamed back.
 
 the following macros are defined below that utilize jvm_import_external:
 

rules/private/phases/phase_zinc_compile.bzl

@@ -89,6 +89,7 @@ def phase_zinc_compile(ctx, g):
         executable = worker.files_to_run.executable,
         input_manifests = input_manifests,
         execution_requirements = _resolve_execution_reqs(ctx, {"no-sandbox": "1", "supports-workers": "1"}),
+        use_default_shell_env = True,
         arguments = [args],
     )
 
@@ -104,7 +105,7 @@ def phase_zinc_compile(ctx, g):
         deps = depset(
             [struct(
                 apis = apis,
-                jars = jars,
+                jars = tuple(jars),
                 label = ctx.label,
                 relations = relations,
             )],

rules/private/phases/phase_zinc_depscheck.bzl

@@ -31,7 +31,8 @@ def phase_zinc_depscheck(ctx, g):
         deps_args.add_all("--direct", [dep.label for dep in ctx.attr.deps], format_each = "_%s")
         deps_args.add_all(labeled_jars, map_each = _depscheck_labeled_group)
         deps_args.add("--label", ctx.label, format = "_%s")
-        deps_args.add_all("--whitelist", [dep.label for dep in ctx.attr.deps_used_whitelist], format_each = "_%s")
+        deps_args.add_all("--used_whitelist", [dep.label for dep in ctx.attr.deps_used_whitelist], format_each = "_%s")
+        deps_args.add_all("--unused_whitelist", [dep.label for dep in ctx.attr.deps_unused_whitelist], format_each = "_%s")
         deps_args.add("--")
         deps_args.add(g.compile.used)
         deps_args.add(deps_check)
@@ -44,6 +45,7 @@ def phase_zinc_depscheck(ctx, g):
             executable = deps_configuration.worker.files_to_run.executable,
             input_manifests = worker_input_manifests,
             execution_requirements = _resolve_execution_reqs(ctx, {"supports-workers": "1"}),
+            use_default_shell_env = True,
             arguments = [deps_args],
         )
         deps_checks[name] = deps_check

rules/scala.bzl

@@ -107,6 +107,10 @@ _compile_attributes = {
         doc = "The JVM library dependencies to always consider used for `scala_deps_used` checks.",
         providers = [JavaInfo],
     ),
+    "deps_unused_whitelist": attr.label_list(
+        doc = "The JVM library dependencies to always consider unused for `scala_deps_direct` checks.",
+        providers = [JavaInfo],
+    ),
     "runtime_deps": attr.label_list(
         doc = "The JVM runtime-only library dependencies.",
         providers = [JavaInfo],