Merge dependency_analyzer and unused_dependency_checker

We merge dependency_analyer and unused_dependency_checker
projects because of the code they have in common, and
because we will be adding additional forms of checking
which would be complex with two different projects
going on.

Author: Jamie5

scala/private/common_attributes.bzl

@@ -66,13 +66,6 @@ common_attrs.update({
         ],
         mandatory = False,
     ),
-    "_unused_dependency_checker_plugin": attr.label(
-        default = Label(
-            "@io_bazel_rules_scala//third_party/unused_dependency_checker/src/main:unused_dependency_checker",
-        ),
-        allow_files = [".jar"],
-        mandatory = False,
-    ),
     "unused_dependency_checker_ignored_targets": attr.label_list(default = []),
     "_code_coverage_instrumentation_worker": attr.label(
         default = "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/coverage/instrumenter",

scala/private/rule_impls.bzl

@@ -66,7 +66,7 @@ def compile_scala(
     input_plugins = plugins
     plugins = _collect_plugin_paths(plugins)
     internal_plugin_jars = []
-    dependency_analyzer_mode = "off"
+    strict_deps_mode = "off"
     compiler_classpath_jars = cjars
     optional_scalac_args = ""
     classpath_resources = []
@@ -75,7 +75,7 @@ def compile_scala(
 
     if is_dependency_analyzer_on(ctx):
         # "off" mode is used as a feature toggle, that preserves original behaviour
-        dependency_analyzer_mode = ctx.fragments.java.strict_java_deps
+        strict_deps_mode = ctx.fragments.java.strict_java_deps
         dep_plugin = ctx.attr._dependency_analyzer_plugin
         plugins = depset(transitive = [plugins, dep_plugin.files])
         internal_plugin_jars = ctx.files._dependency_analyzer_plugin
@@ -102,9 +102,9 @@ CurrentTarget: {current_target}
         )
 
     elif unused_dependency_checker_mode != "off":
-        unused_dependency_plugin = ctx.attr._unused_dependency_checker_plugin
-        plugins = depset(transitive = [plugins, unused_dependency_plugin.files])
-        internal_plugin_jars = ctx.files._unused_dependency_checker_plugin
+        dependency_analyzer_plugin = ctx.attr._dependency_analyzer_plugin
+        plugins = depset(transitive = [plugins, dependency_analyzer_plugin.files])
+        internal_plugin_jars = ctx.files._dependency_analyzer_plugin
 
         cjars_list = cjars.to_list()
         direct_jars = _join_path(cjars_list)
@@ -152,7 +152,7 @@ ResourceSources: {resource_sources}
 ResourceJars: {resource_jars}
 ScalacOpts: {scala_opts}
 SourceJars: {srcjars}
-DependencyAnalyzerMode: {dependency_analyzer_mode}
+StrictDepsMode: {strict_deps_mode}
 UnusedDependencyCheckerMode: {unused_dependency_checker_mode}
 StatsfileOutput: {statsfile_output}
 """.format(
@@ -170,7 +170,7 @@ StatsfileOutput: {statsfile_output}
         resource_targets = ",".join([p[0] for p in resource_paths]),
         resource_sources = ",".join([p[1] for p in resource_paths]),
         resource_jars = _join_path(resource_jars),
-        dependency_analyzer_mode = dependency_analyzer_mode,
+        strict_deps_mode = strict_deps_mode,
         unused_dependency_checker_mode = unused_dependency_checker_mode,
         statsfile_output = statsfile.path,
     )

src/java/io/bazel/rulesscala/scalac/CompileOptions.java

@@ -24,7 +24,7 @@ public class CompileOptions {
   public final String[] ignoredTargets;
   public final String[] indirectJars;
   public final String[] indirectTargets;
-  public final String dependencyAnalyzerMode;
+  public final String strictDepsMode;
   public final String unusedDependencyCheckerMode;
   public final String currentTarget;
   public final String statsfile;
@@ -59,7 +59,7 @@ public CompileOptions(List<String> args) {
     indirectJars = getCommaList(argMap, "IndirectJars");
     indirectTargets = getCommaList(argMap, "IndirectTargets");
 
-    dependencyAnalyzerMode = getOrElse(argMap, "DependencyAnalyzerMode", "off");
+    strictDepsMode = getOrElse(argMap, "StrictDepsMode", "off");
     unusedDependencyCheckerMode = getOrElse(argMap, "UnusedDependencyCheckerMode", "off");
     currentTarget = getOrElse(argMap, "CurrentTarget", "NA");
 

src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java

@@ -173,16 +173,17 @@ private static boolean isModeEnabled(String mode) {
   private static String[] getPluginParamsFrom(CompileOptions ops) {
     ArrayList<String> pluginParams = new ArrayList<>(0);
 
-    if (isModeEnabled(ops.dependencyAnalyzerMode)) {
+    if (isModeEnabled(ops.strictDepsMode)) {
       String[] indirectTargets = encodeBazelTargets(ops.indirectTargets);
       String currentTarget = encodeBazelTarget(ops.currentTarget);
 
       String[] dependencyAnalyzerParams = {
         "-P:dependency-analyzer:direct-jars:" + String.join(":", ops.directJars),
         "-P:dependency-analyzer:indirect-jars:" + String.join(":", ops.indirectJars),
         "-P:dependency-analyzer:indirect-targets:" + String.join(":", indirectTargets),
-        "-P:dependency-analyzer:mode:" + ops.dependencyAnalyzerMode,
+        "-P:dependency-analyzer:strict-deps-mode:" + ops.strictDepsMode,
         "-P:dependency-analyzer:current-target:" + currentTarget,
+        "-P:dependency-analyzer:dependency-tracking-method:" + "high-level",
       };
       pluginParams.addAll(Arrays.asList(dependencyAnalyzerParams));
     } else if (isModeEnabled(ops.unusedDependencyCheckerMode)) {
@@ -191,11 +192,12 @@ private static String[] getPluginParamsFrom(CompileOptions ops) {
       String currentTarget = encodeBazelTarget(ops.currentTarget);
 
       String[] unusedDependencyCheckerParams = {
-        "-P:unused-dependency-checker:direct-jars:" + String.join(":", ops.directJars),
-        "-P:unused-dependency-checker:direct-targets:" + String.join(":", directTargets),
-        "-P:unused-dependency-checker:ignored-targets:" + String.join(":", ignoredTargets),
-        "-P:unused-dependency-checker:mode:" + ops.unusedDependencyCheckerMode,
-        "-P:unused-dependency-checker:current-target:" + currentTarget,
+        "-P:dependency-analyzer:direct-jars:" + String.join(":", ops.directJars),
+        "-P:dependency-analyzer:direct-targets:" + String.join(":", directTargets),
+        "-P:dependency-analyzer:unused-deps-ignored-targets:" + String.join(":", ignoredTargets),
+        "-P:dependency-analyzer:unused-deps-mode:" + ops.unusedDependencyCheckerMode,
+        "-P:dependency-analyzer:current-target:" + currentTarget,
+        "-P:dependency-analyzer:dependency-tracking-method:" + "high-level",
       };
       pluginParams.addAll(Arrays.asList(unusedDependencyCheckerParams));
     }