Migrate from java_common.create_provider to JavaInfo() (#781)

* Migrate from java_common.create_provider to JavaInfo()

* Fix scala/private/common.bzl

* Fix some build failures.

* Fix some more builds.

* Remove scala/private/common:create_java_provider

* Remove unused _create_provider.

* Remove unused load statement

* Also propagate deps and runtime_deps in scala_import with no jars.

* Address review comments.

* Update custom-jvm-rule.bzl

* Update BUILD

* typo

* Removed implicit value for deps_providers.

* Add dummy intermediate jar file for scala_import with no jars.

* Cleanup code.

* Replace + with lists extend.

* Revert enabling --all_incompatible_changes test by mistake.

.gitignore

@@ -5,3 +5,4 @@ hash1
 hash2
 .DS_store
 .bazel_cache
+.ijwb

scala/BUILD

@@ -58,3 +58,9 @@ _declare_scalac_provider(
     ],
     visibility = ["//visibility:public"],
 )
+
+java_library(
+    name = "PlaceHolderClassToCreateEmptyJarForScalaImport",
+    srcs = ["PlaceHolderClassToCreateEmptyJarForScalaImport.java"],
+    visibility = ["//visibility:public"],
+)

scala/PlaceHolderClassToCreateEmptyJarForScalaImport.java

@@ -0,0 +1 @@
+public class PlaceHolderClassToCreateEmptyJarForScalaImport { }

scala/private/common.bzl

@@ -62,11 +62,14 @@ def _collect_jars_when_dependency_analyzer_is_off(
     runtime_jars = []
     jars2labels = {}
 
+    deps_providers = []
+
     for dep_target in dep_targets:
         # we require a JavaInfo for dependencies
         # must use java_import or scala_import if you have raw files
         if JavaInfo in dep_target:
             java_provider = dep_target[JavaInfo]
+            deps_providers.append(java_provider)
             compile_jars.append(java_provider.compile_jars)
             runtime_jars.append(java_provider.transitive_runtime_jars)
 
@@ -90,19 +93,22 @@ def _collect_jars_when_dependency_analyzer_is_off(
         transitive_runtime_jars = depset(transitive = runtime_jars),
         jars2labels = JarsToLabelsInfo(jars_to_labels = jars2labels),
         transitive_compile_jars = depset(transitive = compile_jars + plus_one_deps_compile_jars),
+        deps_providers = deps_providers,
     )
 
 def _collect_jars_when_dependency_analyzer_is_on(dep_targets):
     transitive_compile_jars = []
     jars2labels = {}
     compile_jars = []
     runtime_jars = []
+    deps_providers = []
 
     for dep_target in dep_targets:
         # we require a JavaInfo for dependencies
         # must use java_import or scala_import if you have raw files
         if JavaInfo in dep_target:
             java_provider = dep_target[JavaInfo]
+            deps_providers.append(java_provider)
             current_dep_compile_jars = java_provider.compile_jars
             current_dep_transitive_compile_jars = java_provider.transitive_compile_time_jars
             runtime_jars.append(java_provider.transitive_runtime_jars)
@@ -124,6 +130,7 @@ def _collect_jars_when_dependency_analyzer_is_on(dep_targets):
         transitive_runtime_jars = depset(transitive = runtime_jars),
         jars2labels = JarsToLabelsInfo(jars_to_labels = jars2labels),
         transitive_compile_jars = depset(transitive = transitive_compile_jars),
+        deps_providers = deps_providers,
     )
 
 # When import mavan_jar's for scala macros we have to use the jar:file requirement
@@ -163,15 +170,3 @@ def _provider_of_dependency_label_of(dependency, path):
         return dependency[JarsToLabelsInfo].jars_to_labels.get(path)
     else:
         return None
-
-# TODO this seems to have limited value now that JavaInfo has everything
-def create_java_provider(scalaattr, transitive_compile_time_jars):
-    return java_common.create_provider(
-        use_ijar = False,
-        compile_time_jars = scalaattr.compile_jars,
-        runtime_jars = scalaattr.transitive_runtime_jars,
-        transitive_compile_time_jars = depset(
-            transitive = [transitive_compile_time_jars, scalaattr.compile_jars],
-        ),
-        transitive_runtime_jars = scalaattr.transitive_runtime_jars,
-    )

scala/private/rule_impls.bzl

@@ -28,7 +28,6 @@ load(
     "collect_jars",
     "collect_plugin_paths",
     "collect_srcjars",
-    "create_java_provider",
     "not_sources_jar",
     "write_manifest",
 )
@@ -318,10 +317,10 @@ StatsfileOutput: {statsfile_output}
     )
 
 def _interim_java_provider_for_java_compilation(scala_output):
-    return java_common.create_provider(
-        use_ijar = False,
-        compile_time_jars = [scala_output],
-        runtime_jars = [],
+    return JavaInfo(
+        output_jar = scala_output,
+        compile_jar = scala_output,
+        neverlink = True
     )
 
 def _scalac_provider(ctx):
@@ -371,10 +370,12 @@ def try_to_compile_java_jar(
         host_javabase = find_java_runtime_toolchain(ctx, ctx.attr._host_javabase),
         strict_deps = ctx.fragments.java.strict_java_deps,
     )
+
     return struct(
         ijar = provider.compile_jars.to_list().pop(),
         jar = full_java_jar,
         source_jars = provider.source_jars,
+        java_compilation_provider = provider
     )
 
 def collect_java_providers_of(deps):
@@ -394,11 +395,14 @@ def _compile_or_empty(
         jars2labels,
         implicit_junit_deps_needed_for_java_compilation,
         unused_dependency_checker_mode,
-        unused_dependency_checker_ignored_targets):
+        unused_dependency_checker_ignored_targets,
+        deps_providers):
     # We assume that if a srcjar is present, it is not empty
     if len(ctx.files.srcs) + len(srcjars.to_list()) == 0:
         _build_nosrc_jar(ctx)
 
+        scala_compilation_provider = _create_scala_compilation_provider(ctx, ctx.outputs.jar, deps_providers)
+
         #  no need to build ijar when empty
         return struct(
             class_jar = ctx.outputs.jar,
@@ -408,6 +412,7 @@ def _compile_or_empty(
             ijars = [ctx.outputs.jar],
             java_jar = False,
             source_jars = [],
+            merged_provider = scala_compilation_provider
         )
     else:
         in_srcjars = [
@@ -471,6 +476,8 @@ def _compile_or_empty(
             #  so set ijar == jar
             ijar = ctx.outputs.jar
 
+        scala_compilation_provider = _create_scala_compilation_provider(ctx, ijar, deps_providers)
+
         # compile the java now
         java_jar = try_to_compile_java_jar(
             ctx,
@@ -490,6 +497,11 @@ def _compile_or_empty(
 
         coverage = _jacoco_offline_instrument(ctx, ctx.outputs.jar)
 
+        if java_jar:
+            merged_provider = java_common.merge([scala_compilation_provider, java_jar.java_compilation_provider])
+        else:
+            merged_provider = scala_compilation_provider
+
         return struct(
             class_jar = ctx.outputs.jar,
             coverage = coverage,
@@ -498,8 +510,24 @@ def _compile_or_empty(
             ijars = ijars,
             java_jar = java_jar,
             source_jars = source_jars,
+            merged_provider = merged_provider
         )
 
+def _create_scala_compilation_provider(ctx, ijar, deps_providers):
+    exports = []
+    if hasattr(ctx.attr, "exports"):
+        exports = [dep[JavaInfo] for dep in ctx.attr.exports]
+    runtime_deps = []
+    if hasattr(ctx.attr, "runtime_deps"):
+        runtime_deps = [dep[JavaInfo] for dep in ctx.attr.runtime_deps]
+    return JavaInfo(
+        output_jar = ctx.outputs.jar,
+        compile_jar = ijar,
+        deps = deps_providers,
+        exports = exports,
+        runtime_deps = runtime_deps,
+    )
+
 def _build_deployable(ctx, jars_list):
     # This calls bazels singlejar utility.
     # For a full list of available command line options see:
@@ -725,11 +753,13 @@ def _collect_jars_from_common_ctx(
         transitive_rjars,
         jars2labels,
         transitive_compile_jars,
+        deps_providers
     ) = (
         deps_jars.compile_jars,
         deps_jars.transitive_runtime_jars,
         deps_jars.jars2labels,
         deps_jars.transitive_compile_jars,
+        deps_jars.deps_providers
     )
 
     transitive_rjars = depset(
@@ -742,6 +772,7 @@ def _collect_jars_from_common_ctx(
         jars2labels = jars2labels,
         transitive_compile_jars = transitive_compile_jars,
         transitive_runtime_jars = transitive_rjars,
+        deps_providers = deps_providers,
     )
 
 def _lib(
@@ -781,6 +812,7 @@ def _lib(
                           unused_dependency_checker_ignored_targets
         ],
         unused_dependency_checker_mode = unused_dependency_checker_mode,
+        deps_providers = jars.deps_providers,
     )
 
     transitive_rjars = depset(outputs.full_jars, transitive = [transitive_rjars])
@@ -817,13 +849,11 @@ def _lib(
         transitive_runtime_jars = transitive_rjars,
     )
 
-    java_provider = create_java_provider(scalaattr, jars.transitive_compile_jars)
-
     return struct(
         files = depset([ctx.outputs.jar] + outputs.full_jars),  # Here is the default output
         instrumented_files = outputs.coverage.instrumented_files,
         jars_to_labels = jars.jars2labels,
-        providers = [java_provider, jars.jars2labels] + outputs.coverage.providers,
+        providers = [outputs.merged_provider, jars.jars2labels] + outputs.coverage.providers,
         runfiles = runfiles,
         scala = scalaattr,
     )
@@ -877,6 +907,7 @@ def _scala_binary_common(
         java_wrapper,
         unused_dependency_checker_mode,
         unused_dependency_checker_ignored_targets,
+        deps_providers,
         implicit_junit_deps_needed_for_java_compilation = [],
         runfiles_ext = []):
     write_manifest(ctx)
@@ -892,6 +923,7 @@ def _scala_binary_common(
         unused_dependency_checker_ignored_targets =
             unused_dependency_checker_ignored_targets,
         unused_dependency_checker_mode = unused_dependency_checker_mode,
+        deps_providers = deps_providers,
     )  # no need to build an ijar for an executable
     rjars = depset(outputs.full_jars, transitive = [rjars])
 
@@ -918,14 +950,12 @@ def _scala_binary_common(
         transitive_runtime_jars = rjars,
     )
 
-    java_provider = create_java_provider(scalaattr, transitive_compile_time_jars)
-
     return struct(
         executable = executable,
         coverage = outputs.coverage,
         files = depset([executable, ctx.outputs.jar]),
         instrumented_files = outputs.coverage.instrumented_files,
-        providers = [java_provider, jars2labels] + outputs.coverage.providers,
+        providers = [outputs.merged_provider, jars2labels] + outputs.coverage.providers,
         runfiles = runfiles,
         scala = scalaattr,
         transitive_rjars =
@@ -991,6 +1021,7 @@ def scala_binary_impl(ctx):
                           ctx.attr.unused_dependency_checker_ignored_targets
         ],
         unused_dependency_checker_mode = unused_dependency_checker_mode,
+        deps_providers = jars.deps_providers,
     )
     _write_executable(
         ctx = ctx,
@@ -1054,6 +1085,7 @@ trap finish EXIT
                           ctx.attr.unused_dependency_checker_ignored_targets
         ],
         unused_dependency_checker_mode = unused_dependency_checker_mode,
+        deps_providers = jars.deps_providers,
     )
     _write_executable(
         ctx = ctx,
@@ -1140,6 +1172,7 @@ def scala_test_impl(ctx):
             unused_dependency_checker_ignored_targets,
         unused_dependency_checker_mode = unused_dependency_checker_mode,
         runfiles_ext = [argsFile],
+        deps_providers = jars.deps_providers,
     )
 
     rjars = out.transitive_rjars
@@ -1265,6 +1298,7 @@ def scala_junit_test_impl(ctx):
         unused_dependency_checker_ignored_targets =
             unused_dependency_checker_ignored_targets,
         unused_dependency_checker_mode = unused_dependency_checker_mode,
+        deps_providers = jars.deps_providers,
     )
 
     if ctx.attr.tests_from:

scala/scala_import.bzl

@@ -24,64 +24,36 @@ def _scala_import_impl(ctx):
         ctx.label,
         jars2labels,
     )  #last to override the label of the export compile jars to the current target
+
+    current_target_providers = [_new_java_info(ctx, jar) for jar in current_target_compile_jars]
+
+    # Handle the case with no jars.
+    # TODO(#8867): Migrate away from the placeholder jar hack when #8867 is fixed.
+    if not current_target_providers:
+        current_target_providers = [_new_java_info(ctx, ctx.file._placeholder_jar)]
+
     return struct(
         scala = struct(
             outputs = struct(jars = intellij_metadata),
         ),
         providers = [
-            _create_provider(
-                current_jars,
-                transitive_runtime_jars,
-                jars,
-                exports,
-                ctx.attr.neverlink,
-                ctx.file.srcjar,
-                intellij_metadata,
-            ),
+            java_common.merge(current_target_providers),
             DefaultInfo(
                 files = current_jars,
             ),
             JarsToLabelsInfo(jars_to_labels = jars2labels),
         ],
     )
 
-def _create_provider(
-        current_target_compile_jars,
-        transitive_runtime_jars,
-        jars,
-        exports,
-        neverlink,
-        source_jar,
-        intellij_metadata):
-    transitive_runtime_jars = [
-        transitive_runtime_jars,
-        jars.transitive_runtime_jars,
-        exports.transitive_runtime_jars,
-    ]
-
-    if not neverlink:
-        transitive_runtime_jars.append(current_target_compile_jars)
-
-    source_jars = []
-
-    if source_jar:
-        source_jars.append(source_jar)
-    else:
-        for metadata in intellij_metadata:
-            source_jars.extend(metadata.source_jars)
-
-    return java_common.create_provider(
-        use_ijar = False,
-        compile_time_jars = depset(
-            transitive = [current_target_compile_jars, exports.compile_jars],
-        ),
-        transitive_compile_time_jars = depset(transitive = [
-            jars.transitive_compile_jars,
-            current_target_compile_jars,
-            exports.transitive_compile_jars,
-        ]),
-        transitive_runtime_jars = depset(transitive = transitive_runtime_jars),
-        source_jars = source_jars,
+def _new_java_info(ctx, jar):
+    return JavaInfo(
+        output_jar = jar,
+        compile_jar = jar,
+        exports = [target[JavaInfo] for target in ctx.attr.exports],
+        deps = [target[JavaInfo] for target in ctx.attr.deps],
+        runtime_deps = [target[JavaInfo] for target in ctx.attr.runtime_deps],
+        source_jar = ctx.file.srcjar,
+        neverlink = ctx.attr.neverlink,
     )
 
 def _add_labels_of_current_code_jars(code_jars, label, jars2labels):
@@ -169,5 +141,9 @@ scala_import = rule(
         "exports": attr.label_list(),
         "neverlink": attr.bool(),
         "srcjar": attr.label(allow_single_file = True),
+        "_placeholder_jar": attr.label(
+            allow_single_file = True,
+            default = Label("@io_bazel_rules_scala//scala:libPlaceHolderClassToCreateEmptyJarForScalaImport.jar"),
+        ),
     },
 )