Improve jdeps artifact output determinism logic

uber-common · May 22, 2024 · e1ca46b · e1ca46b
1 parent e431985
commit e1ca46b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMerger.kt b/src/main/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMerger.kt
@@ -63,7 +63,7 @@ class JdepsMerger {
       reportUnusedDeps: String,
     ): Int {
       val rootBuilder = Deps.Dependencies.newBuilder()
-      val usedResources = mutableSetOf<String>()
+      val usedResources = sortedSetOf<String>()
       rootBuilder.success = false
       rootBuilder.ruleLabel = label
 
@@ -92,7 +92,7 @@ class JdepsMerger {
       }
 
       rootBuilder.addAllDependency(dependencyMap.values)
-      rootBuilder.addAllUsedResources(usedResources.sorted())
+      rootBuilder.addAllUsedResources(usedResources)
 
       rootBuilder.success = true
       rootBuilder.build().toByteArray()

diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenExtension.kt b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenExtension.kt
@@ -340,14 +340,14 @@ class JdepsGenExtension(
     rootBuilder.ruleLabel = targetLabel
 
     val unusedDeps = directDeps.subtract(explicitDeps.keys)
-    unusedDeps.forEach { jarPath ->
+    unusedDeps.sorted().forEach { jarPath ->
       val dependency = Deps.Dependency.newBuilder()
       dependency.kind = Deps.Dependency.Kind.UNUSED
       dependency.path = jarPath
       rootBuilder.addDependency(dependency)
     }
 
-    explicitDeps.forEach { (jarPath, usedClasses) ->
+    explicitDeps.toSortedMap().forEach { (jarPath, usedClasses) ->
       val dependency = Deps.Dependency.newBuilder()
       dependency.kind = Deps.Dependency.Kind.EXPLICIT
       dependency.path = jarPath
@@ -370,7 +370,7 @@ class JdepsGenExtension(
       rootBuilder.addDependency(dependency)
     }
 
-    implicitDeps.keys.subtract(explicitDeps.keys).forEach {
+    implicitDeps.keys.subtract(explicitDeps.keys).sorted().forEach {
       val dependency = Deps.Dependency.newBuilder()
       dependency.kind = Deps.Dependency.Kind.IMPLICIT
       dependency.path = it