From e03a8423170ae9e1aecc40b8a3f25024f9b73883 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Mon, 24 Apr 2017 19:24:45 +0300 Subject: [PATCH] KT-15050 Use more stable way to specify idea compatible version Here we have to specify build number static field as system properties are out of our control and they could be wiped out externally #KT-15050 Fixed --- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 7f2b39d2473..dde3e90d06b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -25,6 +25,7 @@ import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.CoreJavaFileManager import com.intellij.core.JavaCoreApplicationEnvironment import com.intellij.core.JavaCoreProjectEnvironment +import com.intellij.ide.plugins.PluginManagerCore import com.intellij.lang.MetaLanguage import com.intellij.lang.java.JavaParserDefinition import com.intellij.mock.MockApplication @@ -329,6 +330,8 @@ class KotlinCoreEnvironment private constructor( } companion object { + private val ideaCompatibleBuildNumber = "171.9999" + init { setCompatibleBuild() } @@ -365,7 +368,8 @@ class KotlinCoreEnvironment private constructor( @JvmStatic private fun setCompatibleBuild() { - System.getProperties().setProperty("idea.plugins.compatible.build", "171.9999") + PluginManagerCore.BUILD_NUMBER = ideaCompatibleBuildNumber + System.getProperties().setProperty("idea.plugins.compatible.build", ideaCompatibleBuildNumber) } @TestOnly