From b56639a7755b7eed2f785cadf317266e513ac2b9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 15 Feb 2017 17:57:29 +0300 Subject: [PATCH] Filter out files with the same paths in runtime version checker To prevent listing them several times in the diagnostic message --- .../kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt index 3c3e7e16b42..4ce0cadc2a1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt @@ -246,11 +246,15 @@ object JvmRuntimeVersionsConsistencyChecker { val coreJars = ArrayList(2) val otherLibrariesWithBundledRuntime = ArrayList(0) + val visitedPaths = hashSetOf() + for (jarRoot in classpathJarRoots) { val fileKind = determineFileKind(jarRoot) if (fileKind is FileKind.Irrelevant) continue val jarFile = VfsUtilCore.getVirtualFileForJar(jarRoot) ?: continue + if (!visitedPaths.add(jarFile.path)) continue + when (fileKind) { is FileKind.Runtime -> { val file = KotlinLibraryFile(jarFile, fileKind.version)