azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IDE: don't exclude external system libraries (e.g. from gradle) when getting library version in facetUtils

Browse Source
This commit is contained in:
Zalim Bashorov
2016-11-18 17:12:34 +03:00
committed by Zalim Bashorov
parent 5a533a521b
commit 4374d353ba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+2 -2
View File
@@ -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<LibraryOrderEntry>()
.mapNotNull { it.library?.let { getLibraryProperties(presentationProvider, it) }?.versionString }
.mapNotNull { it.library?.let { presentationProvider.detect(it.getFiles(OrderRootType.CLASSES).toList())?.versionString } }
.toList()
}