From b647d2c645b67b7c39efbe460d0618cc709d12eb Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Fri, 24 Jan 2020 12:47:05 +0300 Subject: [PATCH] Prolong deprecation cycle for several restrictions until 1.5 ProhibitInvisibleAbstractMethodsInSuperclasses & ProhibitNonReifiedArraysAsReifiedTypeArguments were implemented in 1.3.70, so actually they should be enabled only in 1.5 --- .../jetbrains/kotlin/config/LanguageVersionSettings.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt index 441a097c309..50bb64aa949 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -112,8 +112,6 @@ enum class LanguageFeature( ProperComputationOrderOfTailrecDefaultParameters(KOTLIN_1_4), AllowNullableArrayArgsInMain(KOTLIN_1_4), TrailingCommas(KOTLIN_1_4), - ProhibitInvisibleAbstractMethodsInSuperclasses(KOTLIN_1_4, kind = BUG_FIX), - ProhibitNonReifiedArraysAsReifiedTypeArguments(KOTLIN_1_4, kind = BUG_FIX), ProhibitProtectedCallFromInline(KOTLIN_1_4, kind = BUG_FIX), ProperFinally(KOTLIN_1_4, kind = BUG_FIX), AllowAssigningArrayElementsToVarargsInNamedFormForFunctions(KOTLIN_1_4), @@ -128,13 +126,13 @@ enum class LanguageFeature( FunctionalInterfaceConversion(KOTLIN_1_4, kind = UNSTABLE_FEATURE), ProhibitSpreadOnSignaturePolymorphicCall(KOTLIN_1_5, kind = BUG_FIX), + ProhibitInvisibleAbstractMethodsInSuperclasses(KOTLIN_1_5, kind = BUG_FIX), + ProhibitNonReifiedArraysAsReifiedTypeArguments(KOTLIN_1_5, kind = BUG_FIX), + ProhibitVarargAsArrayAfterSamArgument(KOTLIN_1_5, kind = BUG_FIX), // Temporarily disabled, see KT-27084/KT-22379 SoundSmartcastFromLoopConditionForLoopAssignedVariables(sinceVersion = null, kind = BUG_FIX), - // TODO: set `sinceVersion` to KOTLIN_1_5 - ProhibitVarargAsArrayAfterSamArgument(sinceVersion = null, kind = BUG_FIX), - // Experimental features Coroutines(