From 352a10a0ed1da342714ea822657b4e20b913f2d2 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 14 Nov 2019 15:32:52 +0300 Subject: [PATCH] Do not fail tests on unknown version of gradle Kotlin plugin --- .../idea/configuration/nativeLibrariesUtil.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt index b1c21d38c98..4b9f117424e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.configuration +import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.ProjectKeys @@ -118,9 +119,8 @@ internal class KotlinNativeLibrariesDependencySubstitutor( private val kotlinVersion: String? by lazy { val classpathData = buildClasspathData(gradleModule, resolverCtx) val result = findKotlinPluginVersion(classpathData) - if (result == null) - LOG.error( - """ + if (result == null) { + val message = """ Unexpectedly can't obtain Kotlin Gradle plugin version for ${gradleModule.name} module. Build classpath is ${classpathData.classpathEntries.flatMap { it.classesFile }}. ${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()}" } """.trimIndent() - ) - + if (ApplicationManager.getApplication().isUnitTestMode) + LOG.warn(message) + else + LOG.error(message) + } result }