diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java index 1ff38739dbe..2d2b5842e9f 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java @@ -63,6 +63,4 @@ public interface KotlinPaths { @NotNull File getCompilerPath(); - @NotNull - File getBuildNumberFile(); } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java index 4fcef768d58..af7de9203b5 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java @@ -112,12 +112,6 @@ public class KotlinPathsFromHomeDir implements KotlinPaths { return getLibraryFile(PathUtil.KOTLIN_COMPILER_JAR); } - @NotNull - @Override - public File getBuildNumberFile() { - return new File(homePath, "build.txt"); - } - @NotNull private File getLibraryFile(@NotNull String fileName) { return new File(getLibPath(), fileName); diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt index 64afc98c446..5c0e3905d82 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt @@ -41,6 +41,7 @@ import com.intellij.util.indexing.ScalarIndexExtension import com.intellij.util.text.VersionComparatorUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.config.JvmTarget +import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.configuration.* import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil @@ -213,17 +214,12 @@ enum class LibraryJarDescriptor(val jarName: String, fun getPathInPlugin() = getPath(PathUtil.kotlinPathsForIdeaPlugin) } -fun bundledRuntimeVersion(): String { - return bundledRuntimeBuildNumber ?: pluginRuntimeVersion(KotlinPluginUtil.getPluginVersion()) -} +fun bundledRuntimeVersion(): String = KotlinCompilerVersion.VERSION -private val bundledRuntimeBuildNumber: String? by lazy { - val file = PathUtil.kotlinPathsForIdeaPlugin.buildNumberFile - if (file.exists()) file.readText().trim() else null -} private val PLUGIN_VERSIONS_SEPARATORS = arrayOf("Idea", "IJ", "release", "dev", "Studio") +// TODO: Used only in tests, can be removed fun pluginRuntimeVersion(pluginVersion: String): String { var placeToSplit = -1