Topological sort jars (so that the target jar comes first)

fix #1456
bazelbuild · Dec 7, 2022 · c7add52 · c7add52
1 parent 2cc2d56
commit c7add52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scala/private/phases/phase_compile.bzl b/scala/private/phases/phase_compile.bzl
@@ -149,7 +149,7 @@ def _phase_compile(
     # TODO: simplify the return values and use provider
     return struct(
         files = depset(out.full_jars),
-        rjars = depset(out.full_jars, transitive = [rjars]),
+        rjars = depset(out.full_jars, transitive = [rjars], order = "topological"),
         merged_provider = out.merged_provider,
         external_providers = {
             "JavaInfo": out.merged_provider,

diff --git a/test/src/main/scala/scalarules/test/duplicated_resources/child/BUILD b/test/src/main/scala/scalarules/test/duplicated_resources/child/BUILD
@@ -5,8 +5,8 @@ scala_test(
     name = "child",
     size = "small",
     srcs = ["ScalaLibResourcesDuplicatedTest.scala"],
+    resource_strip_prefix = "test/src/main/scala/scalarules/test/duplicated_resources/child/",
     resources = ["resource.txt"],
     unused_dependency_checker_mode = "off",
-    resource_strip_prefix = "test/src/main/scala/scalarules/test/duplicated_resources/child/",
     deps = ["//test/src/main/scala/scalarules/test/duplicated_resources/parent"],
 )
diff --git a/test/src/main/scala/scalarules/test/duplicated_resources/parent/BUILD b/test/src/main/scala/scalarules/test/duplicated_resources/parent/BUILD
@@ -2,7 +2,7 @@ load("//scala:scala.bzl", "scala_library")
 
 scala_library(
     name = "parent",
-    resources = ["resource.txt"],
     resource_strip_prefix = "test/src/main/scala/scalarules/test/duplicated_resources/parent/",
+    resources = ["resource.txt"],
     visibility = ["//test/src/main/scala/scalarules/test/duplicated_resources/child:__pkg__"],
 )