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

Do not fail tests on unknown version of gradle Kotlin plugin

Browse Source
This commit is contained in:
Andrey Uskov
2019-11-14 15:32:52 +03:00
parent e963b71921
commit 352a10a0ed
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt
+8 -5
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.idea.configuration package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.DataNode
import com.intellij.openapi.externalSystem.model.ProjectKeys import com.intellij.openapi.externalSystem.model.ProjectKeys
@@ -118,9 +119,8 @@ internal class KotlinNativeLibrariesDependencySubstitutor(
private val kotlinVersion: String? by lazy { private val kotlinVersion: String? by lazy {
val classpathData = buildClasspathData(gradleModule, resolverCtx) val classpathData = buildClasspathData(gradleModule, resolverCtx)
val result = findKotlinPluginVersion(classpathData) val result = findKotlinPluginVersion(classpathData)
if (result == null) if (result == null) {
LOG.error( val message = """
"""
Unexpectedly can't obtain Kotlin Gradle plugin version for ${gradleModule.name} module. Unexpectedly can't obtain Kotlin Gradle plugin version for ${gradleModule.name} module.
Build classpath is ${classpathData.classpathEntries.flatMap { it.classesFile }}. Build classpath is ${classpathData.classpathEntries.flatMap { it.classesFile }}.
${KotlinNativeLibrariesDependencySubstitutor::class.java.simpleName} will run in idle mode. No dependencies will be substituted. ${KotlinNativeLibrariesDependencySubstitutor::class.java.simpleName} will run in idle mode. No dependencies will be substituted.
@@ -132,8 +132,11 @@ internal class KotlinNativeLibrariesDependencySubstitutor(
kotlin("multiplatform") version "${bundledRuntimeVersion()}" kotlin("multiplatform") version "${bundledRuntimeVersion()}"
} }
""".trimIndent() """.trimIndent()
) if (ApplicationManager.getApplication().isUnitTestMode)
LOG.warn(message)
else
LOG.error(message)
}
result result
} }