From 38f8924ae3cf52387a07c559fcf5daaa337f00b7 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 9 Mar 2018 11:46:00 +0100 Subject: [PATCH] Update test data. Use simple ''@JvmDefault' instead full qualifier --- .../codegen/java8/box/jvm8/defaults/accessor.kt | 6 +++--- .../box/jvm8/defaults/accessorFromCompanion.kt | 4 ++-- .../box/jvm8/defaults/accessorsFromDefaultImpls.kt | 4 ++-- .../java8/box/jvm8/defaults/bridgeInClass.kt | 2 +- .../java8/box/jvm8/defaults/bridgeInInterface.kt | 4 ++-- .../java8/box/jvm8/defaults/bridgeInInterface2.kt | 4 ++-- .../defaults/bridgeInInterfaceWithProperties.kt | 4 ++-- .../defaults/bridgeInInterfaceWithProperties2.kt | 4 ++-- .../java8/box/jvm8/defaults/bridgeWithJava.kt | 2 +- .../java8/box/jvm8/defaults/callableReference.kt | 4 ++-- .../java8/box/jvm8/defaults/capturedSuperCall.kt | 2 +- .../codegen/java8/box/jvm8/defaults/defaultArgs.kt | 2 +- .../java8/box/jvm8/defaults/delegationBy/simple.kt | 2 +- .../jvm8/defaults/delegationBy/simpleProperty.kt | 2 +- .../codegen/java8/box/jvm8/defaults/diamond.kt | 4 ++-- .../codegen/java8/box/jvm8/defaults/inline.kt | 4 ++-- .../java8/box/jvm8/defaults/inlineProperty.kt | 4 ++-- .../codegen/java8/box/jvm8/defaults/kt11969.kt | 10 +++++----- .../codegen/java8/box/jvm8/defaults/kt14243.kt | 2 +- .../codegen/java8/box/jvm8/defaults/kt14243_2.kt | 2 +- .../java8/box/jvm8/defaults/kt14243_prop.kt | 2 +- .../noDelegationToDefaultMethodInClass.kt | 2 +- .../noDelegationToDefaultMethodInInterface.kt | 2 +- .../noDelegationToDefaultMethodInInterface2.kt | 2 +- .../java8/box/jvm8/defaults/oneImplementation.kt | 4 ++-- .../java8/box/jvm8/defaults/oneImplementation2.kt | 4 ++-- .../jvm8/defaults/privateDefaultFromDefaultImpl.kt | 4 ++-- .../box/jvm8/defaults/privateInDefaultImpls.kt | 2 +- .../defaults/reflection/propertyAnnotations.kt | 2 +- .../codegen/java8/box/jvm8/defaults/simpleCall.kt | 2 +- .../java8/box/jvm8/defaults/simpleProperty.kt | 2 +- .../codegen/java8/box/jvm8/defaults/superCall.kt | 4 ++-- .../codegen/java8/box/mapRemove/noDefaultImpls.kt | 2 +- .../jvm8/defaults/superCall.kt | 2 +- .../jvm8/defaults/superCallFromInterface.kt | 4 ++-- .../jvm8/defaults/superPropAccess.kt | 2 +- .../jvm8/defaults/superPropAccessFromInterface.kt | 4 ++-- .../jvm8against6/delegation/diamond.kt | 4 ++-- .../jvm8against6/delegation/diamond2.kt | 2 +- .../jvm8against6/delegation/diamond3.kt | 2 +- .../jvm8against6/simpleCallWithBigHierarchy.kt | 2 +- .../jvm8against6/simpleCallWithHierarchy.kt | 2 +- .../jvm8against6/simplePropWithHierarchy.kt | 2 +- .../java8/writeFlags/defaults/defaultMethod.kt | 2 +- .../java8/writeFlags/defaults/defaultProperty.kt | 2 +- .../annotations/jvmDefault/generic.kt | 2 +- .../annotations/jvmDefault/generic.txt | 2 +- .../annotations/jvmDefault/notInterface.kt | 10 +++++----- .../annotations/jvmDefault/notInterface.txt | 10 +++++----- .../annotations/jvmDefault/propertyAccessor.kt | 8 ++++---- .../annotations/jvmDefault/propertyAccessor.txt | 2 +- .../annotations/jvmDefault/simpleOverride.kt | 2 +- .../annotations/jvmDefault/simpleOverride.txt | 2 +- .../jvmDefault/simpleOverrideWithFeature.kt | 4 ++-- .../jvmDefault/simpleOverrideWithFeature.txt | 4 ++-- .../jvmDefault/simplePropertyOverride.kt | 2 +- .../jvmDefault/simplePropertyOverride.txt | 2 +- .../annotations/jvmDefault/target6.kt | 14 +++++++------- .../annotations/jvmDefault/target6.txt | 14 +++++++------- .../annotations/jvmDefault/target8.kt | 14 +++++++------- .../annotations/jvmDefault/target8.txt | 14 +++++++------- 61 files changed, 121 insertions(+), 121 deletions(-) diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt index da788cb8bb9..43689913a25 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt @@ -6,19 +6,19 @@ var storage = "fail" interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault private var foo: String get() = storage set(value) { storage = value } - @kotlin.annotations.JvmDefault + @JvmDefault private fun bar(): String { return "K" } - @kotlin.annotations.JvmDefault + @JvmDefault fun call(): String { return { foo = "O" diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt index ab09c39aa00..dc86200c060 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt @@ -3,11 +3,11 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault private val foo: String get() = "O" - @kotlin.annotations.JvmDefault + @JvmDefault private fun bar(): String { return "K" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt index 8345e07de15..dd580e1281f 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt @@ -3,11 +3,11 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault private val foo: String get() = "O" - @kotlin.annotations.JvmDefault + @JvmDefault private fun bar(): String { return "K" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt index f7a975ec793..436ec07ed17 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(p: T): T { return p } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt index 42178acbc8f..36fc0d0296a 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt @@ -3,14 +3,14 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(p: T): T { return p } } interface Test2: Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(p: String): String { return p + "K" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt index 4252ed8feea..8797f73b028 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt @@ -4,7 +4,7 @@ // FULL_JDK interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(p: T): T { return null!! } @@ -15,7 +15,7 @@ interface Test { } interface Test2: Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(p: String): String { return p } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt index 07617f42623..d4ecaf832db 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault var test: T get() = null!! set(value) { @@ -13,7 +13,7 @@ interface Test { var result = "fail" interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override var test: String get() = result set(value) { diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt index 1542c929417..06934008ae3 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt @@ -4,7 +4,7 @@ // FULL_JDK interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault var T.test: T get() = null!! set(value) { @@ -19,7 +19,7 @@ interface Test { } interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override var String.test: String get() = "" set(value) {} diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt index 8a9fa88431c..18afdbdbb97 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt @@ -12,7 +12,7 @@ public interface Test { // FILE: kotlin.kt interface Test2: Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(p: String): String { return p } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt index c44959b8b48..de902b7b02a 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt @@ -3,10 +3,10 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun foo(): String = "O" - @kotlin.annotations.JvmDefault + @JvmDefault val bar: String get() = "K" diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt index b1211d25476..e00cb135982 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface IBase { - @kotlin.annotations.JvmDefault + @JvmDefault fun bar() = "OK" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt index b8dc91931b7..3ec0ded7580 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt @@ -2,7 +2,7 @@ // JVM_TARGET: 1.8 // WITH_RUNTIME interface Z { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(s: String = "OK"): String { return s } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt index a37d8fd6f41..cc4b87dc14b 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "O" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt index d273076b916..6f18c5af5a7 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault val test: String get() = "O" diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt index 6239907ba77..f7895c50524 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt @@ -4,7 +4,7 @@ // FULL_JDK interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "Test" } @@ -16,7 +16,7 @@ open class TestClass : Test { interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return "Test2" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt index 8dfea0faa09..e847cb26a1a 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return inlineFun { "O" } } @@ -12,7 +12,7 @@ interface Test { return inlineFun { "K" } } - @kotlin.annotations.JvmDefault + @JvmDefault private inline fun inlineFun(s: () -> String) = s() } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt index 930a5749090..7467866fcbc 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return inlineProp } @@ -12,7 +12,7 @@ interface Test { return inlineProp } - @kotlin.annotations.JvmDefault + @JvmDefault private inline val inlineProp: String get() = "OK" diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt index cfa64a5974d..20ffb2ebeb2 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt @@ -5,19 +5,19 @@ interface Z { - @kotlin.annotations.JvmDefault + @JvmDefault private fun privateFun() = { "OK" } - @kotlin.annotations.JvmDefault + @JvmDefault fun callPrivateFun() = privateFun() - @kotlin.annotations.JvmDefault + @JvmDefault fun publicFun() = { "OK" } - @kotlin.annotations.JvmDefault + @JvmDefault fun funWithDefaultArgs(s: () -> Unit = {}): () -> Unit - @kotlin.annotations.JvmDefault + @JvmDefault val property: () -> Unit get() = {} diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt index 0edb6a448bc..fd3d70c7b2b 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Z { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(p: T): T { return p } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt index a693f47c49d..863d509621e 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Z { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(p: T): T { return p } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt index 8ea5dd2587c..953383ca845 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt @@ -6,7 +6,7 @@ interface Z { val value: T - @kotlin.annotations.JvmDefault + @JvmDefault val z: T get() = value } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt index dba8fdea305..de7ad4e9de2 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME // FULL_JDK interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() { } } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt index 23f130f205f..e69f350ce40 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME // FULL_JDK interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() { } } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt index 0ed08741ae3..684c7d46e60 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt @@ -4,7 +4,7 @@ // FULL_JDK interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() { } } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt index ebd28cd9cb5..92c4ffb842f 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt @@ -3,12 +3,12 @@ // WITH_RUNTIME interface KCallable { - @kotlin.annotations.JvmDefault + @JvmDefault val returnType: String } interface KCallableImpl : KCallable { - @kotlin.annotations.JvmDefault + @JvmDefault override val returnType: String get() = "OK" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt index 76638b93ed6..844dd1e4746 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt @@ -3,12 +3,12 @@ // WITH_RUNTIME interface KCallable { - @kotlin.annotations.JvmDefault + @JvmDefault val returnType: String } interface KCallableImpl : KCallable { - @kotlin.annotations.JvmDefault + @JvmDefault override val returnType: String get() = "OK" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt index c67c22f6226..1b96222f154 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt @@ -7,12 +7,12 @@ interface Test { return privateFun() + privateProp } - @kotlin.annotations.JvmDefault + @JvmDefault private fun privateFun(): String { return "O" } - @kotlin.annotations.JvmDefault + @JvmDefault private val privateProp: String get() = "K" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt index aa1eb60a88c..aee785a2bc1 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return privateFun() + privateProp } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt index bbe239d9c4a..ea056de0bea 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt @@ -7,7 +7,7 @@ annotation class Accessor(val value: String) interface Z { @Property("OK") - @kotlin.annotations.JvmDefault + @JvmDefault val z: String @Accessor("OK") get() = "OK" diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt index 88ddefb0985..337713a5660 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "OK" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt index bb1b204544c..511fbb381d5 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Z { - @kotlin.annotations.JvmDefault + @JvmDefault val z: String get() = "OK" } diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt index 9a5f4baba07..827059a35cc 100644 --- a/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt +++ b/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt @@ -3,14 +3,14 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "OK" } } interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return super.test() } diff --git a/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt b/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt index c2ec96cf006..6bd9aa55da7 100644 --- a/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt +++ b/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt @@ -12,7 +12,7 @@ class B : A, java.util.AbstractMap() { } interface C : MutableMap { - @kotlin.annotations.JvmDefault + @JvmDefault override fun remove(key: K, value: V) = true } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt index 2757b9cf496..f407a489a83 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME // FILE: 1.kt interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "OK" } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt index b82523127ed..27742ca33e3 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME // FILE: 1.kt interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "OK" } @@ -12,7 +12,7 @@ interface Test { // FILE: 2.kt interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return super.test() } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt index e96eaab019e..d7d58e6f8f5 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME // FILE: 1.kt interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault val prop: String get() = "OK" } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt index f69005a0320..1f435c88bca 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt @@ -3,14 +3,14 @@ // WITH_RUNTIME // FILE: 1.kt interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault val prop: String get() = "OK" } // FILE: 2.kt interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override val prop: String get() = super.prop } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt index a16e6309b7e..f8703993948 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt @@ -10,7 +10,7 @@ interface Test { // JVM_TARGET: 1.8 // WITH_RUNTIME interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return super.test() } @@ -22,7 +22,7 @@ interface Test3 : Test { interface Test4 : Test2, Test3 { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return super.test() } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt index 6f85946ea88..7e4b9c693a0 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt @@ -16,7 +16,7 @@ open class TestClass : Test { } interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt index 08c5302255d..178ad756480 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt @@ -14,7 +14,7 @@ abstract class TestClass : Test { } interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return "OK" } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt index 492685094a3..7551cd21e21 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt @@ -10,7 +10,7 @@ interface Test { // JVM_TARGET: 1.8 // WITH_RUNTIME interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return super.test() } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt index 5de7ed20994..44888698a81 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt @@ -11,7 +11,7 @@ interface Test { // JVM_TARGET: 1.8 // WITH_RUNTIME interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override fun test(): String { return super.test() } diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt index 1c1cf0e679d..73cdd052059 100644 --- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt +++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt @@ -10,7 +10,7 @@ interface Test { // JVM_TARGET: 1.8 // WITH_RUNTIME interface Test2 : Test { - @kotlin.annotations.JvmDefault + @JvmDefault override val test: String get() = super.test } diff --git a/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt b/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt index 0d4232e1df1..2c75c1e0987 100644 --- a/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt +++ b/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(): String { return "OK" } diff --git a/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt b/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt index aa6a6b9c841..5a6eb7b3a42 100644 --- a/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt +++ b/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt @@ -3,7 +3,7 @@ // WITH_RUNTIME interface Test { - @kotlin.annotations.JvmDefault + @JvmDefault var z: String get() = "OK" set(value) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt index 45b5fd6dadb..b70931e6170 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt @@ -2,7 +2,7 @@ // !API_VERSION: 1.3 // !JVM_TARGET: 1.8 interface A { - @kotlin.annotations.JvmDefault + @JvmDefault fun test(p: T) { } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt index ab81181edaa..535f69049a1 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt @@ -3,7 +3,7 @@ package public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public open fun test(/*0*/ p: T): kotlin.Unit + @kotlin.jvm.JvmDefault public open fun test(/*0*/ p: T): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt index ea5ac772fd6..b42107d9437 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt @@ -3,21 +3,21 @@ // !JVM_TARGET: 1.8 abstract class A { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() {} - @kotlin.annotations.JvmDefault + @JvmDefault abstract fun test2(s: String = "") - @kotlin.annotations.JvmDefault + @JvmDefault abstract fun test3() } object B { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() {} - @kotlin.annotations.JvmDefault + @JvmDefault fun test2(s: String = "") {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt index f310d510890..437125aebe0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt @@ -4,9 +4,9 @@ public abstract class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public final fun test(): kotlin.Unit - @kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit - @kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit + @kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit + @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit + @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -14,7 +14,7 @@ public object B { private constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public final fun test(): kotlin.Unit - @kotlin.annotations.JvmDefault public final fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit + @kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit + @kotlin.jvm.JvmDefault public final fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt index f6d4a3e6ebd..82c1cc7acdc 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt @@ -3,12 +3,12 @@ // !JVM_TARGET: 1.8 interface B { - @kotlin.annotations.JvmDefault + @JvmDefault val prop1: String - @kotlin.annotations.JvmDefault get() = "" + @JvmDefault get() = "" var prop2: String - @kotlin.annotations.JvmDefault get() = "" - @kotlin.annotations.JvmDefault set(value) {} + @JvmDefault get() = "" + @JvmDefault set(value) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt index cb8c415fc0a..8a8cfa86a23 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt @@ -1,7 +1,7 @@ package public interface B { - @kotlin.annotations.JvmDefault public open val prop1: kotlin.String + @kotlin.jvm.JvmDefault public open val prop1: kotlin.String public open var prop2: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt index c1d632b3459..cf31faa9d37 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt @@ -2,7 +2,7 @@ // !API_VERSION: 1.3 // !JVM_TARGET: 1.8 interface A { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt index b684e59689a..b112aafa747 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt @@ -3,7 +3,7 @@ package public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit + @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.kt index 9128f2f0230..05ca4eca7f2 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.kt @@ -1,8 +1,8 @@ // !API_VERSION: 1.3 // !JVM_TARGET: 1.8 -@kotlin.annotations.JvmDefaultFeature +@JvmDefaultFeature interface A { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() { } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.txt index 7ef05ffcf59..a897d2a323d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.txt @@ -1,9 +1,9 @@ package -@kotlin.annotations.JvmDefaultFeature public interface A { +@kotlin.jvm.JvmDefaultFeature public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit + @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt index 14f5a2ad6dc..52f3337baf6 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt @@ -2,7 +2,7 @@ // !API_VERSION: 1.3 // !JVM_TARGET: 1.8 interface A { - @kotlin.annotations.JvmDefault + @JvmDefault val test: String get() = "OK" } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt index e7b9e261fe5..423d0b1282d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt @@ -1,7 +1,7 @@ package public interface A { - @kotlin.annotations.JvmDefault public open val test: kotlin.String + @kotlin.jvm.JvmDefault public open val test: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt index a98847001cd..4e5e4a2eb12 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt @@ -3,28 +3,28 @@ // !JVM_TARGET: 1.6 interface B { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() {} - @kotlin.annotations.JvmDefault + @JvmDefault abstract fun test2(s: String = "") - @kotlin.annotations.JvmDefault + @JvmDefault abstract fun test3() - @kotlin.annotations.JvmDefault + @JvmDefault abstract val prop: String - @kotlin.annotations.JvmDefault + @JvmDefault abstract val prop2: String - @kotlin.annotations.JvmDefault + @JvmDefault val prop3: String get() = "" - @kotlin.annotations.JvmDefault + @JvmDefault var prop4: String get() = "" set(value) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt index 080785254a5..e804d227eb0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt @@ -1,14 +1,14 @@ package public interface B { - @kotlin.annotations.JvmDefault public abstract val prop: kotlin.String - @kotlin.annotations.JvmDefault public abstract val prop2: kotlin.String - @kotlin.annotations.JvmDefault public open val prop3: kotlin.String - @kotlin.annotations.JvmDefault public open var prop4: kotlin.String + @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String + @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String + @kotlin.jvm.JvmDefault public open val prop3: kotlin.String + @kotlin.jvm.JvmDefault public open var prop4: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit - @kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit - @kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit + @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit + @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit + @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt index 66bfb8a59f2..e6eadfeffe3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt @@ -3,27 +3,27 @@ // !JVM_TARGET: 1.8 interface B { - @kotlin.annotations.JvmDefault + @JvmDefault fun test() {} - @kotlin.annotations.JvmDefault + @JvmDefault abstract fun test2(s: String = "") - @kotlin.annotations.JvmDefault + @JvmDefault abstract fun test3() - @kotlin.annotations.JvmDefault + @JvmDefault abstract val prop: String - @kotlin.annotations.JvmDefault + @JvmDefault abstract val prop2: String - @kotlin.annotations.JvmDefault + @JvmDefault val prop3: String get() = "" - @kotlin.annotations.JvmDefault + @JvmDefault var prop4: String get() = "" set(value) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt index 080785254a5..e804d227eb0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt @@ -1,14 +1,14 @@ package public interface B { - @kotlin.annotations.JvmDefault public abstract val prop: kotlin.String - @kotlin.annotations.JvmDefault public abstract val prop2: kotlin.String - @kotlin.annotations.JvmDefault public open val prop3: kotlin.String - @kotlin.annotations.JvmDefault public open var prop4: kotlin.String + @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String + @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String + @kotlin.jvm.JvmDefault public open val prop3: kotlin.String + @kotlin.jvm.JvmDefault public open var prop4: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit - @kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit - @kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit + @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit + @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit + @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String }