jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-18 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin Facet: Scan classpath backwards when looking for kotlin-gradle-plugin dependency

Browse Source 
#KT-15899 Fixed
This commit is contained in:
Alexey Sedunov
2017-02-09 18:03:44 +03:00
parent 330beebb2c
commit 7fbca4e122
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
View File

@@ -183,6 +183,8 @@ fun KotlinFacet.configureFacet(
}
}
compilerInfo.coroutineSupport = coroutineSupport
compilerInfo.commonCompilerArguments?.languageVersion = versionInfo.languageLevel!!.versionString
compilerInfo.commonCompilerArguments?.apiVersion = versionInfo.apiLevel!!.versionString
}
}

2
idea/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt
View File

@@ -79,7 +79,7 @@ private val KOTLIN_PLUGIN_PATH_MARKER_FOR_MAVEN_LOCAL_REPO =
"${KotlinWithGradleConfigurator.GROUP_ID.replace('.', '/')}/${KotlinWithGradleConfigurator.GRADLE_PLUGIN_ID}/"
internal fun findKotlinPluginVersion(classpathData: BuildScriptClasspathData): String? {
for (classPathEntry in classpathData.classpathEntries) {
for (classPathEntry in classpathData.classpathEntries.asReversed()) {
for (path in classPathEntry.classesFile) {
val uniformedPath = path.replace('\\', '/')
// check / for local maven repo, and '.' for gradle