diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt index 0ad012a8346..8ad655bd0d6 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // SKIP_JDK6 // IGNORE_BACKEND: JVM_IR diff --git a/compiler/testData/codegen/box/jvm8/defaults/accessor.kt b/compiler/testData/codegen/box/jvm8/defaults/accessor.kt index 0e4089c3100..e93ef3b6488 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/accessor.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/accessor.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt b/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt index 1328f64c9ce..4556388b36f 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt b/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt index 117b8312411..9ceb2820dca 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt index aca170b47e5..4b2012a071e 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt index 55592a5f3d9..07bc4c0c248 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt index a3e567982a7..c760b298842 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt index b8f97a787c5..314bae1c1d9 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt index 84b39208016..ab4e420d616 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt index 3a85a82c08f..0f00dd3ea6f 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt @@ -1,11 +1,12 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME // FULL_JDK + // FILE: Test.java + public interface Test { default T test(T p) { return null; diff --git a/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt b/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt index 78d2edb1294..1aac61afaf9 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt b/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt index c3f24da89f7..e11d497002b 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt index 09b7c2044e8..ae9128d817f 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -37,4 +36,4 @@ fun box(): String { if (result != "OK") return "fail 1: ${result}" return Foo().test2("OK") -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt index ea61663296b..5e6b9ec3a41 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // TARGET_BACKEND: JVM // FILE: Simple.java @@ -34,4 +33,4 @@ interface KInterface2 : KInterface { fun box(): String { return Foo().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt index 565c8a87504..e200ae225bf 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // TARGET_BACKEND: JVM // FILE: Simple.java @@ -38,4 +37,4 @@ interface KInterface3 : KInterface2 { fun box(): String { return Foo().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt index 41dacbe3662..4e3338fa955 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -42,4 +41,4 @@ fun box(): String { return Foo().bar -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt index 57c082772f9..6ee5e3d8826 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -39,4 +38,4 @@ interface KInterface2 : KInterface { fun box(): String { return Foo().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt index 356bbb77ddf..9439fa1065c 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -41,4 +40,4 @@ interface KInterface3 : KInterface2 { fun box(): String { return Foo().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt index 0c7f129fa49..1f386b69644 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt @@ -1,9 +1,9 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME // FULL_JDK + interface Test { @JvmDefault fun test(s: String ="OK"): String { diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt index 41fa046bdee..49a5733ea0b 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -36,4 +35,4 @@ fun box(): String { if (result != "OK") return "fail 1: ${result}" return Foo().test2() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt index be674030aae..adc93753317 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -23,4 +22,4 @@ fun box() : String { val value = Z::z.annotations.filterIsInstance().single().value if (value != "OK") return value return (Z::z.getter.annotations.single() as Accessor).value -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt index a2691c1fc56..d64e63ffb0d 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -32,4 +31,4 @@ fun box(): String { if (result != "OK") return "fail 1: ${result}" return Foo().test2() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt index 1624d98633c..ccb939ec00c 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt @@ -1,9 +1,9 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME + interface Z { @JvmDefault fun test(s: String = "OK"): String { @@ -15,4 +15,4 @@ class Test: Z fun box(): String { return Test().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt index 3093e2bd50c..3a4d2a3a3d1 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt index 5519da0f925..ec681dd03f4 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/diamond.kt b/compiler/testData/codegen/box/jvm8/defaults/diamond.kt index e06b0cddb1e..744ec0da45e 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/diamond.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/diamond.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/inline.kt b/compiler/testData/codegen/box/jvm8/defaults/inline.kt index 29a1bd65ebe..8b5b706a284 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/inline.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/inline.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt index b82a2b421fa..dae36c145db 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt b/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt index 1ebdbde1c2f..de181ec78b5 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt index e6da2ecdf65..a18bbb494e2 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -23,4 +22,4 @@ class ZImpl2 : ZImpl() { fun box(): String { return ZImpl2().test("OK") -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt index f574cc8b43a..5208f38f382 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -25,4 +24,4 @@ class ZImpl3 : ZImpl2() { fun box(): String { return ZImpl3().test("OK") -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt index 43fd979c42c..4604088acd1 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 @@ -26,4 +25,4 @@ open class ZImpl2 : ZImpl() { fun box(): String { return ZImpl2().value -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt index 32642699ae6..03e74d1a93f 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt index c2c6dea8c48..c9178ca2eeb 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt index 8c2cd00ae6b..4687a5d08f2 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt b/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt index bf248ec9ba2..61dd177704d 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 @@ -23,4 +22,4 @@ open class KMutableProperty1Impl : KProperty1Impl(), KCallable fun box(): String { return KMutableProperty1Impl().returnType -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt b/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt index 5007fb5d740..d758ea81eab 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 @@ -28,4 +27,4 @@ open class KMutableProperty1Impl : KProperty1Impl(), KMutableProperty1, KMutable fun box(): String { return KMutableProperty1Impl().returnType -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt b/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt index d7a62ce8be6..3b0aebee624 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -24,4 +23,4 @@ class TestImpl: Test fun box(): String { return TestImpl().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt b/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt index b26560fab81..912c6b41a61 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -23,4 +22,4 @@ class TestImpl: Test fun box(): String { return TestImpl().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt index a099095c770..ea144e8fbca 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -23,4 +22,4 @@ fun box() : String { val value = Z::z.annotations.filterIsInstance().single().value if (value != "OK") return value return (Z::z.getter.annotations.single() as Accessor).value -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt b/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt index 5f4566cb68d..4156a51427c 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt index feb9f06a3e7..5fadbf6ad23 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 @@ -15,4 +14,4 @@ class Test : Z fun box() : String { return Test().z -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/defaults/superCall.kt b/compiler/testData/codegen/box/jvm8/defaults/superCall.kt index cd7af96b0c9..4842e0d367d 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/superCall.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/superCall.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM @@ -27,4 +26,4 @@ class TestClass : Test2 { fun box(): String { return TestClass().test() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt index 9414e2e0eb2..f2a77803275 100644 --- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt +++ b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt @@ -1,8 +1,8 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 // WITH_RUNTIME // FULL_JDK + interface KInterface { @JvmDefault fun test(s: String ="OK"): String { @@ -17,4 +17,4 @@ interface KInterface { // 1 INVOKEINTERFACE KInterface.test //from $jd -// 1 INVOKESPECIAL KInterface.test \ No newline at end of file +// 1 INVOKESPECIAL KInterface.test diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt index 4570f89d04d..6ace7993aab 100644 --- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt +++ b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 @@ -17,4 +16,4 @@ interface KInterface2 : KInterface { // 1 INVOKESTATIC KInterface.access\$test2\$jd // 1 INVOKESPECIAL KInterface2.test2 -// 1 INVOKESPECIAL KInterface.test2 \ No newline at end of file +// 1 INVOKESPECIAL KInterface.test2 diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt index 356cb336248..456474ee1d8 100644 --- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt +++ b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt index dfbf5b90112..38a9bfc4c9f 100644 --- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt +++ b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 // WITH_RUNTIME @@ -23,4 +22,4 @@ interface KInterface2 : KInterface { // 1 INVOKESPECIAL KInterface2.getBar // 1 INVOKESPECIAL KInterface2.setBar // 1 INVOKESPECIAL KInterface.getBar -// 1 INVOKESPECIAL KInterface.setBar \ No newline at end of file +// 1 INVOKESPECIAL KInterface.setBar diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt index 5b67009f3a1..18329abfac4 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt index 955a0b83a28..18d9fd5ad8b 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt index 7e95726b42c..694274ca7f0 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt index d0b08a51e0e..b17dbf9417b 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt index a462bbc5118..6defd342c66 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt index a98d5393429..d3d6655f3cb 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt index c13bc4b4936..15e6faacc1d 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // FILE: 1.kt interface Test { diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt index 6ce37521fe4..3ba7991a9b3 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // FILE: 1.kt interface Test { @@ -30,4 +29,4 @@ class TestClass2 : TestClass(), Test2 { fun box(): String { return TestClass().test() -} \ No newline at end of file +} diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt index b1769c16f46..0abbf2d98ea 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // FILE: 1.kt interface Test { diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt index e2cd200182e..1fa4e6dc2ac 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // FILE: 1.kt interface Test { @@ -24,4 +23,4 @@ class TestClass : Test3 fun box(): String { return TestClass().test() -} \ No newline at end of file +} diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt index 963dd47eebf..9dc14e651bb 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // FILE: 1.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt index e9d24434488..33b52cd6de6 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // FILE: 1.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt index 9fc32f42866..97f2b30d9b5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt @@ -1,6 +1,6 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 // !JVM_DEFAULT_MODE: enable + interface A { @JvmDefault fun test(p: T) { @@ -57,4 +57,4 @@ interface D2 : ANonDefault, D { override fun test(p: String) { } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt index 0e42924f618..b7204e24613 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // !JVM_TARGET: 1.8 @@ -70,4 +69,4 @@ interface KotlinInterfaceManySuper: JavaInterface, KotlinInterfaceX { override fun testForNonDefault() {} override fun testAbstract() {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt index 79046057cb9..e89e2deb868 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt @@ -1,5 +1,5 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 + interface A { @JvmDefault fun test() { @@ -33,4 +33,4 @@ open class BarWithJvmDefault : B { } } -class BarWithJvmDefaultSuper: BarWithJvmDefault() \ No newline at end of file +class BarWithJvmDefaultSuper: BarWithJvmDefault() diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt index 1cf0e20a9bb..f7cb28811be 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // !JVM_TARGET: 1.8 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt index bfd2394bf6c..b15d257c398 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // !JVM_TARGET: 1.8 // FILE: JavaInterface.java diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt index 369c86e6ba2..46fb4e1005e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt @@ -1,5 +1,5 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 + interface B { @JvmDefault @@ -26,4 +26,4 @@ interface B { var prop4: String get() = "" set(value) {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt index a84066fa6fd..7378e4a6338 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt @@ -1,5 +1,5 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 + abstract class A { @JvmDefault @@ -19,4 +19,4 @@ object B { @JvmDefault fun test2(s: String = "") {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt index afad8f11aa1..ae9bf7ef203 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt @@ -1,6 +1,6 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 // !JVM_DEFAULT_MODE: enable + interface B { @JvmDefault @@ -11,4 +11,4 @@ interface B { var prop2: String @JvmDefault get() = "" @JvmDefault set(value) {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt index b47e867b8e5..e6f26e0eec0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt @@ -1,6 +1,6 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 // !JVM_DEFAULT_MODE: enable + interface A { @JvmDefault fun test() {} @@ -28,4 +28,4 @@ interface D: A, ANonDefault { class Foo : A { override fun test() {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt index c9be3fed4f9..202e083d645 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt @@ -1,6 +1,6 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 // !JVM_DEFAULT_MODE: enable + interface A { @JvmDefault val test: String @@ -29,4 +29,4 @@ interface C: ANonDefault, A { interface D: A, ANonDefault { override val test: String get() = "C" -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt index c950ff528e3..77391b331c3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt @@ -1,5 +1,5 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.6 + interface B { @JvmDefault @@ -26,4 +26,4 @@ interface B { var prop4: String get() = "" set(value) {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt index 0cdaa66b907..cb0b02d8244 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt @@ -1,6 +1,6 @@ -// !API_VERSION: 1.3 // !JVM_TARGET: 1.8 // !JVM_DEFAULT_MODE: enable + interface B { @JvmDefault @@ -27,4 +27,4 @@ interface B { var prop4: String get() = "" set(value) {} -} \ No newline at end of file +} diff --git a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt b/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt index c6a7c6fd16b..5ea84a5c4e3 100644 --- a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt +++ b/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt b/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt index 1d1f8255883..b68c9469831 100644 --- a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt +++ b/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 // WITH_RUNTIME @@ -18,4 +17,4 @@ interface Test { // TESTED_OBJECT_KIND: function // TESTED_OBJECTS: Test$DefaultImpls, test$annotations -// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED \ No newline at end of file +// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED diff --git a/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt b/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt index 46896b68e36..0552a70ca80 100644 --- a/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt +++ b/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt b/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt index 322ea5f7ed8..7363d499b23 100644 --- a/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt +++ b/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt b/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt index 51b162afafc..95ffcfba561 100644 --- a/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt +++ b/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt @@ -1,4 +1,3 @@ -// !API_VERSION: 1.3 // !JVM_DEFAULT_MODE: enable // JVM_TARGET: 1.8 // WITH_RUNTIME @@ -20,4 +19,4 @@ interface Test { // TESTED_OBJECT_KIND: function // TESTED_OBJECTS: Test$DefaultImpls, test$annotations -// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED \ No newline at end of file +// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED