Integrated dottyijar with the ruleset and wrote tests for it

Author: Jaden Peterson

scala/private/common_attributes.bzl

@@ -78,6 +78,11 @@ common_attrs.update({
         executable = True,
         cfg = "exec",
     ),
+    "_dottyijar": attr.label(
+        cfg = "exec",
+        default = "//src/scala/io/bazel/rules_scala/dottyijar",
+        executable = True,
+    ),
 })
 
 implicit_deps = {

scala/private/phases/phase_compile.bzl

@@ -41,8 +41,10 @@ def phase_compile_library(ctx, p):
     return _phase_compile_default(ctx, p, args)
 
 def phase_compile_library_for_plugin_bootstrapping(ctx, p):
+    is_scala_2 = ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].scala_version.startswith("2.")
+
     args = struct(
-        buildijar = ctx.attr.build_ijar,
+        buildijar = ctx.attr.build_ijar and is_scala_2,
     )
     return _phase_compile_default(ctx, p, args)
 
@@ -102,13 +104,11 @@ def phase_compile_common(ctx, p):
     return _phase_compile_default(ctx, p)
 
 def _phase_compile_default(ctx, p, _args = struct()):
-    buildijar_default_value = True if ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].scala_version.startswith("2.") else False
-
     return _phase_compile(
         ctx,
         p,
         _args.srcjars if hasattr(_args, "srcjars") else depset(),
-        _args.buildijar if hasattr(_args, "buildijar") else buildijar_default_value,
+        not hasattr(_args, "buildijar") or _args.buildijar,
         _args.implicit_junit_deps_needed_for_java_compilation if hasattr(_args, "implicit_junit_deps_needed_for_java_compilation") else [],
         unused_dependency_checker_ignored_targets = _args.unused_dependency_checker_ignored_targets if hasattr(_args, "unused_dependency_checker_ignored_targets") else [],
     )
@@ -228,12 +228,7 @@ def _compile_or_empty(
 
         # build ijar if needed
         if buildijar:
-            ijar = java_common.run_ijar(
-                ctx.actions,
-                jar = ctx.outputs.jar,
-                target_label = ctx.label,
-                java_toolchain = specified_java_compile_toolchain(ctx),
-            )
+            ijar = _build_ijar(ctx)
         else:
             #  macro code needs to be available at compile-time,
             #  so set ijar == jar
@@ -266,6 +261,30 @@ def _compile_or_empty(
             merged_provider = merged_provider,
         )
 
+def _build_ijar(ctx):
+    if ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].scala_version.startswith("2."):
+        return java_common.run_ijar(
+            ctx.actions,
+            jar = ctx.outputs.jar,
+            target_label = ctx.label,
+            java_toolchain = specified_java_compile_toolchain(ctx),
+        )
+
+    output = ctx.actions.declare_file("{}-ijar.jar".format(ctx.label.name))
+    arguments = ctx.actions.args()
+    arguments.add(ctx.outputs.jar)
+    arguments.add(output)
+
+    ctx.actions.run(
+        arguments = [arguments],
+        executable = ctx.executable._dottyijar,
+        inputs = [ctx.outputs.jar],
+        mnemonic = "DottyIjar",
+        outputs = [output],
+    )
+
+    return output
+
 def _build_nosrc_jar(ctx):
     resources = [s + ":" + t for t, s in _resource_paths(ctx.files.resources, ctx.attr.resource_strip_prefix)]
 

test/dottyijar/BUILD

@@ -0,0 +1,33 @@
+load("//scala:scala.bzl", "scala_binary", "scala_library")
+
+scala_library(
+    name = "private-members",
+    srcs = ["PrivateMembers.scala"],
+    tags = ["manual"],
+    scala_version = "3.6.2",
+)
+
+scala_binary(
+    name = "private-members-dependent",
+    srcs = ["PrivateMembersDependent.scala"],
+    main_class = "dottyijar.Main",
+    scala_version = "3.6.2",
+    tags = ["manual"],
+    deps = [":private-members"],
+)
+
+scala_library(
+    name = "definition-values",
+    srcs = ["DefinitionValues.scala"],
+    tags = ["manual"],
+    scala_version = "3.6.2",
+)
+
+scala_library(
+    name = "definition-values-dependent",
+    srcs = ["DefinitionValuesDependent.scala"],
+    main_class = "dottyijar.Main",
+    scala_version = "3.6.2",
+    tags = ["manual"],
+    deps = [":definition-values"],
+)

test/dottyijar/DefinitionValues1.scala

@@ -0,0 +1,5 @@
+package dottyijar
+
+object DefinitionValues {
+  val greeting: String = s"Hello, Bob!"
+}

test/dottyijar/DefinitionValues2.scala

@@ -0,0 +1,5 @@
+package dottyijar
+
+object DefinitionValues {
+  val greeting: String = s"Hello, Bob!".replace("Bob", "Alice")
+}

test/dottyijar/DefinitionValuesDependent.scala

@@ -0,0 +1,5 @@
+package dottyijar
+
+object Main {
+  def main(arguments: Array[String]): Unit = println(DefinitionValues.greeting)
+}

test/dottyijar/PrivateMembers1.scala

@@ -0,0 +1,13 @@
+package dottyijar
+
+object PrivateMembers {
+  private val privateField = ()
+  private lazy val privateLazyField = ()
+
+  val publicField = ()
+  lazy val publicLazyField = ()
+
+  private def privateMethod: Unit = {}
+
+  def publicMethod: Unit = {}
+}

test/dottyijar/PrivateMembers2.scala

@@ -0,0 +1,8 @@
+package dottyijar
+
+object PrivateMembers {
+  val publicField = ()
+  lazy val publicLazyField = ()
+
+  def publicMethod: Unit = {}
+}

test/dottyijar/PrivateMembersDependent.scala

@@ -0,0 +1,5 @@
+package dottyijar
+
+object Main {
+  def main(arguments: Array[String]): Unit = println(PrivateMembers.publicField)
+}

test/shell/test_dottyijar.sh

@@ -0,0 +1,32 @@
+# shellcheck source=./test_runner.sh
+dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+. "${dir}"/test_runner.sh
+. "${dir}"/test_helper.sh
+runner=$(get_test_runner "${1:-local}")
+
+ijar_invariant() {
+  cp "test/dottyijar/$3" "test/dottyijar/$2"
+  trap "rm 'test/dottyijar/$2'" EXIT
+
+  bazel build "//test/dottyijar:$1-dependent"
+
+  ijar1_path="$(mktemp)"
+
+  cp "bazel-bin/test/dottyijar/$1-ijar.jar" "$ijar1_path"
+
+  cp "test/dottyijar/$4" "test/dottyijar/$2"
+  bazel build "//test/dottyijar:$1-dependent"
+
+  diff "$ijar1_path" "bazel-bin/test/dottyijar/$1-ijar.jar"
+}
+
+ijar_invariant_to_private_members() {
+  ijar_invariant private-members PrivateMembers.scala PrivateMembers1.scala PrivateMembers2.scala
+}
+
+ijar_invariant_to_definition_values() {
+  ijar_invariant definition-values DefinitionValues.scala DefinitionValues1.scala DefinitionValues2.scala
+}
+
+$runner ijar_invariant_to_private_members
+$runner ijar_invariant_to_definition_values