From 4374d353baca0164171b54edbeee760fdc519ac1 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 18 Nov 2016 17:12:34 +0300 Subject: [PATCH] IDE: don't exclude external system libraries (e.g. from gradle) when getting library version in facetUtils --- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 34a3d678604..0379aa2293f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -22,6 +22,7 @@ import com.intellij.openapi.projectRoots.JavaSdkVersion import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootModel +import com.intellij.openapi.roots.OrderRootType import com.intellij.util.text.VersionComparatorUtil import org.jetbrains.kotlin.cli.common.arguments.copyBean import org.jetbrains.kotlin.config.JvmTarget @@ -33,7 +34,6 @@ import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgu import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings import org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider -import org.jetbrains.kotlin.idea.framework.getLibraryProperties import org.jetbrains.kotlin.idea.versions.* private fun getRuntimeLibraryVersions( @@ -56,7 +56,7 @@ private fun getRuntimeLibraryVersions( .orderEntries .asSequence() .filterIsInstance() - .mapNotNull { it.library?.let { getLibraryProperties(presentationProvider, it) }?.versionString } + .mapNotNull { it.library?.let { presentationProvider.detect(it.getFiles(OrderRootType.CLASSES).toList())?.versionString } } .toList() }