From f88c703b93f7dc6ec25562fc86f4dce94b6daa07 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Sat, 25 Aug 2018 10:48:00 +0300 Subject: [PATCH] When version is not defined we need to fallback to released There are few more such places. Better fix would be to avoid situation, when we need to fallback. So in every project these settings are defined. It means "Latest stable" setting is not good. #KT-26364 Fixed Original commit: 69a0fedd9fde35e2057ce2dee9377546a44acd9e --- .../kotlin/jps/platforms/KotlinModuleBuildTarget.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/KotlinModuleBuildTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/KotlinModuleBuildTarget.kt index 9b6e245d9fc..678bd491ec3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/KotlinModuleBuildTarget.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/KotlinModuleBuildTarget.kt @@ -21,10 +21,7 @@ import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment -import org.jetbrains.kotlin.config.ApiVersion -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.config.LanguageVersion -import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.ChangesCollector import org.jetbrains.kotlin.incremental.ExpectActualTrackerImpl @@ -313,7 +310,7 @@ abstract class KotlinModuleBuildTarget( val lastBuildLangVersion = LanguageVersion.fromVersionString(lastBuildMetaInfo.languageVersionString) val lastBuildApiVersion = ApiVersion.parse(lastBuildMetaInfo.apiVersionString) val currentLangVersion = - args.languageVersion?.let { LanguageVersion.fromVersionString(it) } ?: LanguageVersion.LATEST_STABLE + args.languageVersion?.let { LanguageVersion.fromVersionString(it) } ?: VersionView.RELEASED_VERSION val currentApiVersion = args.apiVersion?.let { ApiVersion.parse(it) } ?: ApiVersion.createByLanguageVersion(currentLangVersion) @@ -339,4 +336,4 @@ abstract class KotlinModuleBuildTarget( } } } -} \ No newline at end of file +}