diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt index 85d3981d700..42d506960b7 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -144,14 +144,15 @@ enum class LanguageFeature( MultiPlatformProjects(sinceVersion = null, defaultState = State.DISABLED), - NewInference(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), + NewInference(sinceVersion = KOTLIN_1_4), // In the next block, features can be enabled only along with new inference + SamConversionForKotlinFunctions(sinceVersion = KOTLIN_1_4), + SamConversionPerArgument(sinceVersion = KOTLIN_1_4), + FunctionReferenceWithDefaultValueAsOtherType(sinceVersion = KOTLIN_1_4), + NonStrictOnlyInputTypesChecks(sinceVersion = KOTLIN_1_4), + BooleanElvisBoundSmartCasts(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), // see KT-26357 for details - SamConversionForKotlinFunctions(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), - SamConversionPerArgument(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), - NewDataFlowForTryExpressions(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), - FunctionReferenceWithDefaultValueAsOtherType(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), - NonStrictOnlyInputTypesChecks(sinceVersion = KOTLIN_1_3), + NewDataFlowForTryExpressions(sinceVersion = KOTLIN_1_4, defaultState = State.DISABLED), ReferencesToSyntheticJavaProperties(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), // ------ // Next features can be enabled regardless of new inference