From 7fbca4e122a716019ae02e8394c32c9e01b12bca Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 9 Feb 2017 18:03:44 +0300 Subject: [PATCH] Kotlin Facet: Scan classpath backwards when looking for kotlin-gradle-plugin dependency #KT-15899 Fixed --- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 2 ++ .../idea/inspections/gradle/KotlinGradleInspectionVisitor.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 1df50c44cb3..1fa56b75958 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -183,6 +183,8 @@ fun KotlinFacet.configureFacet( } } compilerInfo.coroutineSupport = coroutineSupport + compilerInfo.commonCompilerArguments?.languageVersion = versionInfo.languageLevel!!.versionString + compilerInfo.commonCompilerArguments?.apiVersion = versionInfo.apiLevel!!.versionString } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt index 6195dd4f19d..145faa7349c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt @@ -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