From ecfa63c4eaefcfdc01eefb51cce7af8f958cb032 Mon Sep 17 00:00:00 2001 From: Mauricio Galindo Date: Tue, 23 May 2023 15:40:27 -0700 Subject: [PATCH] Normalize label (#968) * Normalize label Normalize the label from the jar the same way the unused_deps tool. See https://github.com/bazelbuild/buildtools/blob/master/unused_deps/unused_deps.go#L181 * Fix identation * Update JdepsMerger.kt --- .../bazel/kotlin/builder/tasks/jvm/JdepsMerger.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 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 index 2e549f89d..9cfbc9702 100644 --- a/src/main/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMerger.kt +++ b/src/main/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMerger.kt @@ -96,11 +96,14 @@ class JdepsMerger { // so we need to make sure wedon't mart the dependency as unused // unless all of the jars are unused. dependencyMap.values.forEach { - val label = readJarOwnerFromManifest(Paths.get(it.path)).label - if (label != null && - kindMap.getOrDefault(label, Deps.Dependency.Kind.UNUSED) >= it.kind - ) { - kindMap.put(label, it.kind) + var label = readJarOwnerFromManifest(Paths.get(it.path)).label + if (label != null) { + if (label.startsWith("@@") || label.startsWith("@/")) { + label = label.substring(1) + } + if (kindMap.getOrDefault(label, Deps.Dependency.Kind.UNUSED) >= it.kind) { + kindMap.put(label, it.kind) + } } }