Revert "[kotlin] Use stable Kotlin version for "Configure Kotlin in Project" and relevant tests"

This reverts commit f44c5129d2c1b27510259dc5a2113aab6bf10462.

#KTIJ-22209 Fixed

GitOrigin-RevId: 07096ed5d3273aa0f1fd615704d34f688714bd8c

11 files changed, 34 insertions, 53 deletions

diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/GradleKotlinFrameworkSupportProvider.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/GradleKotlinFrameworkSupportProvider.kt
index 99fd37b1519d..e6e42c0c348f 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/GradleKotlinFrameworkSupportProvider.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/GradleKotlinFrameworkSupportProvider.kt
@@ -80,7 +80,7 @@ abstract class GradleKotlinFrameworkSupportProvider(
         specifyPluginVersionIfNeeded: Boolean,
         explicitPluginVersion: String? = null
     ) {
-        var kotlinVersion = explicitPluginVersion ?: KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort
+        var kotlinVersion = explicitPluginVersion ?: kotlinCompilerVersionShort()
         val additionalRepository = getRepositoryForVersion(kotlinVersion)
         if (isSnapshot(kotlinVersion)) {
             kotlinVersion = LAST_SNAPSHOT_VERSION
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
index 596f1ac50085..42d7e6d98bdd 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
@@ -50,7 +50,7 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
         modifiableModelsProvider: ModifiableModelsProvider,
         buildScriptData: BuildScriptDataBuilder
     ) {
-        var kotlinVersion = KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort
+        var kotlinVersion = kotlinCompilerVersionShort()
         val additionalRepository = getRepositoryForVersion(kotlinVersion)
         if (isSnapshot(KotlinPluginLayout.instance.standaloneCompilerVersion)) {
             kotlinVersion = LAST_SNAPSHOT_VERSION
diff --git a/plugins/kotlin/groovy/src/org/jetbrains/kotlin/idea/groovy/inspections/DifferentKotlinGradleVersionInspection.kt b/plugins/kotlin/groovy/src/org/jetbrains/kotlin/idea/groovy/inspections/DifferentKotlinGradleVersionInspection.kt
index b36a6fea7b01..971603874a0f 100644
--- a/plugins/kotlin/groovy/src/org/jetbrains/kotlin/idea/groovy/inspections/DifferentKotlinGradleVersionInspection.kt
+++ b/plugins/kotlin/groovy/src/org/jetbrains/kotlin/idea/groovy/inspections/DifferentKotlinGradleVersionInspection.kt
@@ -3,10 +3,9 @@
 package org.jetbrains.kotlin.idea.groovy.inspections
 
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 import org.jetbrains.kotlin.idea.groovy.KotlinGroovyBundle
 import org.jetbrains.kotlin.idea.inspections.PluginVersionDependentInspection
-import org.jetbrains.kotlin.idea.versions.lastStableKnownCompilerVersionShort
+import org.jetbrains.kotlin.idea.versions.kotlinCompilerVersionShort
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspection
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspectionVisitor
@@ -53,7 +52,7 @@ class DifferentKotlinGradleVersionInspection : BaseInspection(), PluginVersionDe
     }
 
     private inner class MyVisitor : VersionFinder() {
-        private val idePluginVersion by lazy { KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort }
+        private val idePluginVersion by lazy { kotlinCompilerVersionShort() }
 
         override fun onFound(kotlinPluginVersion: String, kotlinPluginStatement: GrCallExpression) {
             if (kotlinPluginVersion != idePluginVersion) {
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
index 96809fa9d83b..cf20438aa578 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
@@ -71,14 +71,8 @@ enum class LibraryJarDescriptor(val mavenArtifactId: String) {
     fun findExistingJar(library: Library): VirtualFile? =
         library.getFiles(OrderRootType.CLASSES).firstOrNull { it.name.startsWith(mavenArtifactId) }
 
-    val repositoryLibraryProperties: RepositoryLibraryProperties
-        get() = RepositoryLibraryProperties(
-            KotlinPathsProvider.KOTLIN_MAVEN_GROUP_ID,
-            mavenArtifactId,
-            KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort,
-            true,
-            emptyList()
-        )
+    val repositoryLibraryProperties: RepositoryLibraryProperties get() =
+        RepositoryLibraryProperties(KotlinPathsProvider.KOTLIN_MAVEN_GROUP_ID, mavenArtifactId, kotlinCompilerVersionShort(), true, emptyList())
 }
 
 @NlsSafe
@@ -98,11 +92,10 @@ private val KOTLIN_COMPILER_VERSION_SEPARATOR = "-(?:dev|release)".toRegex()
  * Bundled compiler version usually looks like: `1.5.0-release-759`.
  * `kotlinCompilerVersionShort` would return `1.5.0` in such case
  */
-val KotlinPluginLayout.lastStableKnownCompilerVersionShort: String
-    get() {
-        val parts = KOTLIN_COMPILER_VERSION_SEPARATOR.split(lastStableKnownCompilerVersion)
-        return parts.first()
-    }
+fun kotlinCompilerVersionShort(): String {
+    val parts = KOTLIN_COMPILER_VERSION_SEPARATOR.split(KotlinPluginLayout.instance.standaloneCompilerVersion)
+    return parts.first()
+}
 
 private val KOTLIN_COMPILER_VERSION_PATTERN = "(\\d+)\\.(\\d+)(?:\\.(\\d+))?.*".toRegex()
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt
index cde8ff23b20d..3a9aec461457 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt
@@ -11,14 +11,13 @@ import com.intellij.util.ThrowableRunnable
 import org.jdom.Document
 import org.jdom.input.SAXBuilder
 import org.jetbrains.kotlin.formatter.FormatSettingsUtil
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 import org.jetbrains.kotlin.idea.inspections.runInspection
 import org.jetbrains.kotlin.idea.test.*
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
+import org.jetbrains.kotlin.idea.versions.kotlinCompilerVersionShort
 import org.jetbrains.kotlin.idea.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils
-import org.jetbrains.kotlin.idea.versions.lastStableKnownCompilerVersionShort
 import org.jetbrains.plugins.groovy.GroovyFileType
 import org.junit.runner.Description
 import java.io.File
@@ -110,7 +109,7 @@ abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTestCase()
 
                         file.extension == "gradle" -> {
                             val text = FileUtil.loadFile(file, true)
-                            val fileText = text.replace("\$PLUGIN_VERSION", KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort)
+                            val fileText = text.replace("\$PLUGIN_VERSION", kotlinCompilerVersionShort())
                             configureByText(file.name, fileText)!!
                         }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
index f87c6cea9041..402e4d1214ec 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
 import org.jetbrains.kotlin.config.*;
 import org.jetbrains.kotlin.idea.artifacts.KotlinArtifactNames;
 import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder;
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout;
 import org.jetbrains.kotlin.idea.facet.FacetUtilsKt;
 import org.jetbrains.kotlin.idea.facet.KotlinFacet;
 import org.jetbrains.kotlin.idea.framework.JSLibraryKind;
@@ -47,31 +46,29 @@ import java.util.List;
 import java.util.stream.StreamSupport;
 
 import static java.util.Collections.*;
-import static org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt.getLastStableKnownCompilerVersionShort;
+import static org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt.kotlinCompilerVersionShort;
 
 @RunWith(JUnit38ClassRunner.class)
 public class ConfigureKotlinTest extends AbstractConfigureKotlinTest {
     public void testNewLibrary() {
         doTestSingleJvmModule();
 
-        String kotlinVersion = getLastStableKnownCompilerVersionShort(KotlinPluginLayout.getInstance());
-
         ModuleRootManager.getInstance(getModule()).orderEntries().forEachLibrary(library -> {
             assertSameElements(
                     Arrays.stream(library.getRootProvider().getFiles(OrderRootType.CLASSES)).map(VirtualFile::getName).toArray(),
-                    PathUtil.KOTLIN_JAVA_STDLIB_NAME + "-" + kotlinVersion + ".jar",
-                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME + "-" + kotlinVersion + ".jar",
-                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME + "-" + kotlinVersion + ".jar",
-                    "kotlin-stdlib-common-" + kotlinVersion + ".jar",
+                    PathUtil.KOTLIN_JAVA_STDLIB_NAME + "-" + kotlinCompilerVersionShort() + ".jar",
+                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME + "-" + kotlinCompilerVersionShort() + ".jar",
+                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME + "-" + kotlinCompilerVersionShort() + ".jar",
+                    "kotlin-stdlib-common-" + kotlinCompilerVersionShort() + ".jar",
                     "annotations-13.0.jar"
             );
 
             assertSameElements(
                     Arrays.stream(library.getRootProvider().getFiles(OrderRootType.SOURCES)).map(VirtualFile::getName).toArray(),
-                    PathUtil.KOTLIN_JAVA_STDLIB_NAME + "-" + kotlinVersion + "-sources.jar",
-                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME + "-" + kotlinVersion + "-sources.jar",
-                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME + "-" + kotlinVersion + "-sources.jar",
-                    "kotlin-stdlib-common-" + kotlinVersion + "-sources.jar",
+                    PathUtil.KOTLIN_JAVA_STDLIB_NAME + "-" + kotlinCompilerVersionShort() + "-sources.jar",
+                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME + "-" + kotlinCompilerVersionShort() + "-sources.jar",
+                    PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME + "-" + kotlinCompilerVersionShort() + "-sources.jar",
+                    "kotlin-stdlib-common-" + kotlinCompilerVersionShort() + "-sources.jar",
                     "annotations-13.0-sources.jar"
             );
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt
index 9d742758520d..0db6e3704e6a 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
 import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder
 import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 import org.jetbrains.kotlin.idea.facet.KotlinFacetType
 import org.jetbrains.kotlin.idea.facet.getRuntimeLibraryVersion
 import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
@@ -34,7 +33,7 @@ import org.jetbrains.kotlin.idea.test.configureKotlinFacet
 import org.jetbrains.kotlin.idea.test.runAll
 import org.jetbrains.kotlin.idea.util.projectStructure.findLibrary
 import org.jetbrains.kotlin.idea.versions.LibraryJarDescriptor
-import org.jetbrains.kotlin.idea.versions.lastStableKnownCompilerVersionShort
+import org.jetbrains.kotlin.idea.versions.kotlinCompilerVersionShort
 import org.junit.internal.runners.JUnit38ClassRunner
 import org.junit.runner.RunWith
 import java.io.File
@@ -93,7 +92,7 @@ class UpdateConfigurationQuickFixTest : BasePlatformTestCase() {
         assertEquals("1.1", KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.apiVersion)
 
         val actualVersion = getRuntimeLibraryVersion(myFixture.module)
-        val expectedVersionPrefix = KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort
+        val expectedVersionPrefix = kotlinCompilerVersionShort()
         assertTrue("$actualVersion expected to start with $expectedVersionPrefix", actualVersion?.startsWith(expectedVersionPrefix) == true)
     }
 
@@ -111,7 +110,7 @@ class UpdateConfigurationQuickFixTest : BasePlatformTestCase() {
         assertEquals(LanguageVersion.KOTLIN_1_1, module.languageVersionSettings.languageVersion)
 
         val actualVersion = getRuntimeLibraryVersion(myFixture.module)
-        val expectedVersionPrefix = KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort
+        val expectedVersionPrefix = kotlinCompilerVersionShort()
         assertTrue("$actualVersion expected to start with $expectedVersionPrefix", actualVersion?.startsWith(expectedVersionPrefix) == true)
     }
 
@@ -137,10 +136,7 @@ class UpdateConfigurationQuickFixTest : BasePlatformTestCase() {
         val kotlinRuntime = module.findLibrary { LibraryJarDescriptor.REFLECT_JAR.findExistingJar(it) != null }
         assertNotNull(kotlinRuntime)
         val sources = kotlinRuntime!!.getFiles(OrderRootType.SOURCES)
-        assertContainsElements(
-            sources.map { it.name },
-            "kotlin-reflect-${KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort}-sources.jar"
-        )
+        assertContainsElements(sources.map { it.name }, "kotlin-reflect-${kotlinCompilerVersionShort()}-sources.jar")
     }
 
     private fun configureRuntime(path: String) {
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
index 7e002498a584..f6314a00bdc5 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.KotlinJvmBundle
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 import org.jetbrains.kotlin.idea.facet.getCleanRuntimeLibraryVersion
 import org.jetbrains.kotlin.idea.facet.getRuntimeLibraryVersion
 import org.jetbrains.kotlin.idea.facet.toApiVersion
@@ -39,7 +38,10 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.util.projectStructure.findLibrary
 import org.jetbrains.kotlin.idea.util.projectStructure.sdk
-import org.jetbrains.kotlin.idea.versions.*
+import org.jetbrains.kotlin.idea.versions.LibraryJarDescriptor
+import org.jetbrains.kotlin.idea.versions.findAllUsedLibraries
+import org.jetbrains.kotlin.idea.versions.findKotlinRuntimeLibrary
+import org.jetbrains.kotlin.idea.versions.kotlinCompilerVersionShort
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 abstract class KotlinWithLibraryConfigurator<P : LibraryProperties<*>> protected constructor() : KotlinProjectConfigurator {
@@ -360,7 +362,7 @@ abstract class KotlinWithLibraryConfigurator<P : LibraryProperties<*>> protected
         RepositoryAddLibraryAction.addLibraryToModule(
             RepositoryLibraryDescription.findDescription(libraryJarDescriptor.repositoryLibraryProperties),
             module,
-            kotlinStdlibVersion ?: KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort,
+            kotlinStdlibVersion ?: kotlinCompilerVersionShort(),
             scope,
             /* downloadSources = */ true,
             /* downloadJavaDocs = */ true
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
index 0188f659070e..ef5cc8918b82 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinJvmBundle;
 import org.jetbrains.kotlin.idea.KotlinPluginUtil;
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout;
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtilsKt;
 import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator;
 import org.jetbrains.kotlin.idea.extensions.gradle.RepositoryDescription;
@@ -43,8 +42,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt.getLastStableKnownCompilerVersionShort;
-
 public class ConfigureDialogWithModulesAndVersion extends DialogWrapper {
     private static final String VERSIONS_LIST_URL =
             "https://search.maven.org/solrsearch/select?q=g:%22org.jetbrains.kotlin%22+AND+a:%22kotlin-stdlib%22&core=gav&rows=20&wt=json";
@@ -160,7 +157,7 @@ public class ConfigureDialogWithModulesAndVersion extends DialogWrapper {
         public static Collection<String> loadVersions(String minimumVersion) throws Exception {
         List<String> versions = new ArrayList<>();
 
-        String kotlinCompilerVersionShort = getLastStableKnownCompilerVersionShort(KotlinPluginLayout.getInstance());
+        String kotlinCompilerVersionShort = KotlinRuntimeLibraryUtilKt.kotlinCompilerVersionShort();
         RepositoryDescription repositoryDescription = ConfigureKotlinInProjectUtilsKt.getRepositoryForVersion(kotlinCompilerVersionShort);
         if (repositoryDescription != null && repositoryDescription.getBintrayUrl() != null) {
             HttpURLConnection eapConnection = HttpConfigurable.getInstance().openHttpConnection(repositoryDescription.getBintrayUrl() + kotlinCompilerVersionShort);
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
index 4f0db0a487d5..e28b8b5d6156 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
@@ -28,7 +28,6 @@ import com.intellij.ui.EditorNotificationProvider.*
 import org.jetbrains.annotations.Nls
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.kotlin.idea.*
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.idea.util.application.invokeLater
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
@@ -93,7 +92,7 @@ class UnsupportedAbiVersionNotificationPanelProvider : EditorNotificationProvide
 
                 answer.createActionLabel(actionLabelText) {
                     ApplicationManager.getApplication().invokeLater {
-                        updateLibraries(project, KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort, badRuntimeLibraries)
+                        updateLibraries(project, kotlinCompilerVersionShort(), badRuntimeLibraries)
                     }
                 }
             }
diff --git a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentKotlinMavenVersionInspection.kt b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentKotlinMavenVersionInspection.kt
index 99aa77aa90a8..625282073e92 100644
--- a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentKotlinMavenVersionInspection.kt
+++ b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentKotlinMavenVersionInspection.kt
@@ -10,15 +10,14 @@ import org.jetbrains.annotations.TestOnly
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
 import org.jetbrains.idea.maven.project.MavenProjectsManager
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 import org.jetbrains.kotlin.idea.inspections.PluginVersionDependentInspection
 import org.jetbrains.kotlin.idea.maven.KotlinMavenBundle
 import org.jetbrains.kotlin.idea.maven.PomFile
-import org.jetbrains.kotlin.idea.versions.lastStableKnownCompilerVersionShort
+import org.jetbrains.kotlin.idea.versions.kotlinCompilerVersionShort
 
 class DifferentKotlinMavenVersionInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java),
     PluginVersionDependentInspection {
-    private val idePluginVersion by lazy { KotlinPluginLayout.instance.lastStableKnownCompilerVersionShort }
+    private val idePluginVersion by lazy { kotlinCompilerVersionShort() }
 
     override var testVersionMessage: String? = null
         @TestOnly set