From 363680e4c9955a0361eac11abeaef674ab0b33a8 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 24 Sep 2021 09:06:37 +0300
Subject: [PATCH] Delay abstract class member forbiddance (see KT-45508) to 1.7

---
 compiler/testData/diagnostics/tests/java8Overrides/kt45508.kt   | 1 +
 .../src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/testData/diagnostics/tests/java8Overrides/kt45508.kt b/compiler/testData/diagnostics/tests/java8Overrides/kt45508.kt
index 73f3b2498f0..c299a342efd 100644
--- a/compiler/testData/diagnostics/tests/java8Overrides/kt45508.kt
+++ b/compiler/testData/diagnostics/tests/java8Overrides/kt45508.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+// !LANGUAGE: +AbstractClassMemberNotImplementedWithIntermediateAbstractClass
 interface A {
     fun foo(): Any
 }
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
index 8046ab0c0e3..13abd5d254c 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -201,7 +201,6 @@ enum class LanguageFeature(
     ForbidUsingExtensionPropertyTypeParameterInDelegate(KOTLIN_1_6, kind = BUG_FIX),
     ProhibitSelfCallsInNestedObjects(KOTLIN_1_6, kind = BUG_FIX),
     ProperCheckAnnotationsTargetInTypeUsePositions(KOTLIN_1_6, kind = BUG_FIX),
-    AbstractClassMemberNotImplementedWithIntermediateAbstractClass(KOTLIN_1_6, kind = BUG_FIX),
 
     SuspendFunctionAsSupertype(KOTLIN_1_6),
     UnrestrictedBuilderInference(KOTLIN_1_6),
@@ -230,6 +229,7 @@ enum class LanguageFeature(
     SafeCallsAreAlwaysNullable(KOTLIN_1_7),
     ApproximateIntegerLiteralTypesInReceiverPosition(KOTLIN_1_7),
     StopPropagatingDeprecationThroughOverrides(KOTLIN_1_7),
+    AbstractClassMemberNotImplementedWithIntermediateAbstractClass(KOTLIN_1_7, kind = BUG_FIX),
 
     // Temporarily disabled, see KT-27084/KT-22379
     SoundSmartcastFromLoopConditionForLoopAssignedVariables(sinceVersion = null, kind = BUG_FIX),