Using JavaProvider, requires Bazel 0.5.2

Remove scala_exports_to_java
Prefer using JavaProvider over scala provider
  (can probably avoid using scala provider completely?)

Author: Stephen Twigg

scala/scala.bzl

@@ -358,13 +358,9 @@ def _collect_jars(targets):
     compile_jars = depset()
     runtime_jars = depset()
     for target in targets:
-        if hasattr(target, "scala"):
-            compile_jars += target.scala.compile_jars
-            runtime_jars += target.scala.transitive_runtime_jars
-        elif java_common.provider in target:
+        if java_common.provider in target:
             java_provider = target[java_common.provider]
-            # TODO(twigg): Use compile_jars when released (narrowly missed 0.5.0 :( )
-            compile_jars += target.java.transitive_deps  # java_provider.compile_jars
+            compile_jars += java_provider.compile_jars
             runtime_jars += java_provider.transitive_runtime_jars
         else:
             # support http_file pointed at a jar. http_jar uses ijar,
@@ -432,10 +428,9 @@ def _lib(ctx, non_macro_lib):
         compile_jars = next_cjars,
         transitive_runtime_jars = transitive_rjars,
     )
-    # TODO(twigg): Linearization is concerning here.
     java_provider = java_common.create_provider(
-        compile_time_jars = scalaattr.compile_jars.to_list(),
-        runtime_jars = scalaattr.transitive_runtime_jars.to_list(),
+        compile_time_jars = scalaattr.compile_jars,
+        runtime_jars = scalaattr.transitive_runtime_jars,
     )
 
     return struct(
@@ -802,20 +797,6 @@ def scala_repositories():
 
   native.bind(name = "io_bazel_rules_scala/dependency/scalatest/scalatest", actual = "@scalatest//jar")
 
-# With providers changes, this is completely deprecatable once bazel release includes
-# fixes to java rules using JavaProvider
-def scala_export_to_java(name, exports, runtime_deps):
-  jars = []
-  for target in exports:
-    jars.append("{}_deploy.jar".format(target))
-
-  native.java_import(
-    name = name,
-    # these are the outputs of the scala_library targets
-    jars = jars,
-    runtime_deps = ["//external:io_bazel_rules_scala/dependency/scala/scala_library"] + runtime_deps
-  )
-
 def _sanitize_string_for_usage(s):
     res_array = []
     for c in s:

test/BUILD

@@ -5,7 +5,6 @@ load("//scala:scala.bzl",
     "scala_library",
     "scala_test",
     "scala_macro_library",
-    "scala_export_to_java",
     "scala_repl",
     "scala_test_suite",
     "scala_library_suite",

twitter_scrooge/twitter_scrooge.bzl

@@ -153,7 +153,7 @@ def _gen_scrooge_srcjar_impl(ctx):
     arguments=["--jvm_flag=%s" % flag for flag in ctx.attr.jvm_flags] + ["@" + argfile.path],
   )
 
-  deps_jars = _collect_scalaattr(ctx.attr.deps)
+  deps_jars = _collect_jars(ctx.attr.deps)
 
   scalaattr = struct(
       outputs = None,
@@ -177,15 +177,16 @@ def _gen_scrooge_srcjar_impl(ctx):
     )],
   )
 
-# TODO(twigg): Use one in scala.bzl ...
-def _collect_scalaattr(targets):
+# TODO(twigg): Use the one in scala.bzl?
+def _collect_jars(targets):
   compile_jars = depset()
   transitive_runtime_jars = depset()
 
   for target in targets:
-    if hasattr(target, "scala"):
-      compile_jars += target.scala.compile_jars
-      transitive_runtime_jars += target.scala.transitive_runtime_jars
+    if java_common.provider in target:
+      java_provider = target[java_common.provider]
+      compile_jars += java_provider.compile_jars
+      transitive_runtime_jars += java_provider.transitive_runtime_jars
 
   return struct(
     compile_jars = compile_jars,