From 22ab43838b4305a389e63f21b8b289c4eb27db37 Mon Sep 17 00:00:00 2001 From: Nicklas Ansman Giertz Date: Thu, 15 Sep 2022 16:39:42 -0400 Subject: [PATCH] KAPT: Skip importing java.lang.System in the stubs This fixes KT-43117 --- .../org/jetbrains/kotlin/gradle/Kapt3IT.kt | 14 +------ .../stubs/ClassFileToSourceStubConverter.kt | 7 +--- .../testData/converter/abstractEnum.txt | 8 ---- .../testData/converter/abstractMethods.txt | 4 -- .../testData/converter/annotations.txt | 14 ------- .../testData/converter/annotations2.txt | 8 ---- .../testData/converter/annotations2_ir.txt | 8 ---- .../testData/converter/annotations3.txt | 14 ------- .../testData/converter/annotations3_ir.txt | 14 ------- .../converter/annotationsWithConstants.txt | 16 -------- .../converter/annotationsWithConstants_ir.txt | 16 -------- .../converter/annotationsWithTargets.txt | 14 ------- .../testData/converter/annotations_ir.txt | 14 ------- .../converter/anonymousInitializer.txt | 2 - .../testData/converter/comments.txt | 16 -------- .../testData/converter/commentsRemoved.txt | 16 -------- .../testData/converter/commentsRemoved_ir.txt | 16 -------- .../testData/converter/comments_ir.txt | 16 -------- .../testData/converter/cyrillicClassName.txt | 4 -- .../testData/converter/dataClass.txt | 2 - .../testData/converter/dataClass_ir.txt | 2 - .../testData/converter/defaultImpls.txt | 6 --- .../testData/converter/defaultImpls_ir.txt | 6 --- .../testData/converter/defaultPackage.txt | 8 ---- .../defaultPackageCorrectErrorTypes.txt | 4 -- .../converter/defaultParameterValueOff.txt | 4 -- .../converter/defaultParameterValueOff_ir.txt | 4 -- .../converter/defaultParameterValueOn.txt | 4 -- .../converter/defaultParameterValueOn_ir.txt | 4 -- .../converter/delegateCorrectErrorTypes.txt | 4 -- .../converter/delegatedProperties.txt | 4 -- .../converter/delegatedProperties_ir.txt | 4 -- .../testData/converter/deprecated.txt | 4 -- .../testData/converter/deprecated_ir.txt | 4 -- .../testData/converter/enumInCompanion.txt | 10 ----- .../testData/converter/enumInCompanion_ir.txt | 10 ----- .../testData/converter/enums.txt | 10 ----- .../converter/errorExtensionReceiver.txt | 2 - .../testData/converter/errorSuperclass.txt | 4 -- .../errorSuperclassCorrectErrorTypes.txt | 40 ------------------- .../testData/converter/errorSuperclass_ir.txt | 4 -- .../testData/converter/fileFacadeJvmName.txt | 2 - .../testData/converter/functions.txt | 2 - .../testData/converter/genericParameters.txt | 2 - .../converter/genericParameters_ir.txt | 2 - .../converter/genericRawSignatures.txt | 2 - .../testData/converter/genericSimple.txt | 12 ------ .../testData/converter/ignoredMembers.txt | 2 - .../converter/implicitReturnTypes.txt | 4 -- .../testData/converter/incorrectDelegate.txt | 6 --- .../converter/incorrectDelegate_ir.txt | 6 --- .../testData/converter/inheritanceSimple.txt | 8 ---- .../testData/converter/inlineClasses.txt | 2 - .../testData/converter/inlineClasses_ir.txt | 2 - .../innerClassesWithTypeParameters.txt | 6 --- .../innerClassesWithTypeParameters_ir.txt | 6 --- .../converter/interfaceImplementation.txt | 4 -- .../testData/converter/invalidFieldName.txt | 4 -- .../converter/javaKeywordsInPackageNames.txt | 4 -- .../testData/converter/javadoc.txt | 4 -- .../testData/converter/jvmDefaultAll.txt | 2 - .../converter/jvmDefaultAllCompatibility.txt | 2 - .../testData/converter/jvmDefaultDisable.txt | 2 - .../testData/converter/jvmDefaultEnable.txt | 2 - .../testData/converter/jvmOverloads.txt | 4 -- .../testData/converter/jvmOverloads_ir.txt | 4 -- .../converter/jvmRepeatableAnnotation.txt | 4 -- .../testData/converter/jvmStatic.txt | 4 -- .../converter/jvmStaticFieldInParent.txt | 2 - .../converter/jvmStaticFieldInParent_ir.txt | 2 - .../testData/converter/jvmStatic_ir.txt | 4 -- .../testData/converter/kt14996.txt | 2 - .../testData/converter/kt14997.txt | 4 -- .../testData/converter/kt14997_ir.txt | 4 -- .../testData/converter/kt14998.txt | 2 - .../testData/converter/kt15145.txt | 2 - .../testData/converter/kt17567.txt | 2 - .../testData/converter/kt17567_ir.txt | 2 - .../testData/converter/kt18377.txt | 2 - .../testData/converter/kt18682.txt | 4 -- .../testData/converter/kt19700.txt | 4 -- .../testData/converter/kt19700_ir.txt | 4 -- .../testData/converter/kt19750.txt | 4 -- .../testData/converter/kt19750_ir.txt | 4 -- .../testData/converter/kt24272.txt | 2 - .../testData/converter/kt24272_ir.txt | 2 - .../testData/converter/kt25071.txt | 4 -- .../testData/converter/kt27126.txt | 6 --- .../testData/converter/kt27126_ir.txt | 6 --- .../testData/converter/kt28306.txt | 4 -- .../testData/converter/kt28306_ir.txt | 4 -- .../testData/converter/kt34569.txt | 2 - .../testData/converter/lazyProperty.txt | 6 --- .../testData/converter/lazyProperty_ir.txt | 6 --- .../testData/converter/leadingDollars.txt | 2 - .../testData/converter/mapEntry.txt | 2 - .../converter/methodParameterNames.txt | 4 -- .../methodPropertySignatureClash.txt | 2 - .../testData/converter/modifiers.txt | 20 ---------- .../testData/converter/modifiers_ir.txt | 20 ---------- .../testData/converter/multifileClass.txt | 4 -- .../testData/converter/nestedClasses.txt | 8 ---- .../testData/converter/nestedClasses2.txt | 10 ----- .../testData/converter/nestedClasses2_ir.txt | 10 ----- .../converter/nestedClassesNonRootPackage.txt | 10 ----- .../nestedClassesNonRootPackage_ir.txt | 10 ----- .../testData/converter/nonExistentClass.txt | 2 - .../nonExistentClassWIthoutCorrection.txt | 4 -- .../nonExistentClassWIthoutCorrection_ir.txt | 4 -- .../converter/nonExistentClass_ir.txt | 2 - .../testData/converter/primitiveTypes.txt | 2 - .../testData/converter/primitiveTypes_ir.txt | 2 - .../testData/converter/properties.txt | 2 - .../converter/propertyAnnotations.txt | 6 --- .../testData/converter/recentlyNullable.txt | 2 - .../converter/repeatableAnnotations.txt | 30 -------------- .../converter/secondaryConstructor.txt | 4 -- .../converter/severalPackageParts.txt | 4 -- .../testData/converter/strangeIdentifiers.txt | 6 --- .../converter/strangeIdentifiers_ir.txt | 6 --- .../testData/converter/stripMetadata.txt | 8 ---- .../testData/converter/suspendArgName.txt | 2 - .../testData/converter/suspendArgName_ir.txt | 2 - .../testData/converter/suspendErrorTypes.txt | 2 - .../testData/converter/topLevel.txt | 4 -- .../testData/converter/topLevel_ir.txt | 4 -- .../converter/unsafePropertyInitializers.txt | 8 ---- .../unsafePropertyInitializers_ir.txt | 8 ---- .../DefaultParameterValues.it.txt | 4 -- .../DefaultParameterValues.it_ir.txt | 4 -- .../kotlinRunner/ErrorLocationMapping.it.txt | 4 -- .../kotlinRunner/NestedClasses.it.txt | 4 -- .../kotlinRunner/NestedClasses.it_ir.txt | 4 -- .../testData/kotlinRunner/Overloads.it.txt | 4 -- .../testData/kotlinRunner/Overloads.it_ir.txt | 4 -- .../testData/kotlinRunner/Simple.it.txt | 8 ---- .../testData/kotlinRunner/Simple.it_ir.txt | 8 ---- 137 files changed, 3 insertions(+), 816 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index 8232fad5811..a3d997327e7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -586,12 +586,7 @@ open class Kapt3IT : Kapt3BaseIT() { buildAndFail("build") { val actual = getErrorMessages() - // try as 0 starting lines first, then as 1 starting line - try { - assertEquals(expected = genJavaErrorString(8, 20), actual = actual) - } catch (e: AssertionError) { - assertEquals(expected = genJavaErrorString(9, 21), actual = actual) - } + assertEquals(expected = genJavaErrorString(7, 19), actual = actual) } buildGradle.modify { @@ -600,12 +595,7 @@ open class Kapt3IT : Kapt3BaseIT() { buildAndFail("build") { val actual = getErrorMessages() - // try as 0 starting lines first, then as 1 starting line - try { - assertEquals(expected = genKotlinErrorString(3, 6), actual = actual) - } catch (e: AssertionError) { - assertEquals(expected = genKotlinErrorString(4, 7), actual = actual) - } + assertEquals(expected = genKotlinErrorString(4, 7), actual = actual) } } } diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 490842794e3..a2edd7bcd1c 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -206,14 +206,9 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati val imports = if (correctErrorTypes) convertImports(ktFile, classDeclaration) else JavacList.nil() - val nonEmptyImports: JavacList = when { - imports.size > 0 -> imports - else -> JavacList.of(treeMaker.Import(treeMaker.FqName("java.lang.System"), false)) - } - val classes = JavacList.of(classDeclaration) - val topLevel = treeMaker.TopLevelJava9Aware(packageClause, nonEmptyImports + classes) + val topLevel = treeMaker.TopLevelJava9Aware(packageClause, imports + classes) if (kdocCommentKeeper != null) { topLevel.docComments = kdocCommentKeeper.getDocTable(topLevel) } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt index ba16efee0a0..f823b47daaa 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public enum E { /*public static final*/ X /* = new E() */, @@ -35,8 +33,6 @@ public enum E { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum E2 { /*public static final*/ X /* = new E2() */, @@ -54,8 +50,6 @@ public enum E2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum E3 { /*public static final*/ X /* = new E3() */, @@ -75,8 +69,6 @@ public enum E3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum E4 { /*public static final*/ X /* = new E4() */; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt index 1625b6d5ecd..19aa6f43fc1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract class Base { @@ -17,8 +15,6 @@ public abstract class Base { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Impl extends Base { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt index d30ba0c3a69..11446319fc0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno1 { @@ -8,8 +6,6 @@ public abstract @interface Anno1 { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno2 { @@ -36,8 +32,6 @@ public abstract @interface Anno2 { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno3 { @@ -48,8 +42,6 @@ public abstract @interface Anno3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Colors { /*public static final*/ WHITE /* = new Colors() */, @@ -62,8 +54,6 @@ public enum Colors { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Enum1 { /*public static final*/ BLACK /* = new Enum1() */, @@ -77,8 +67,6 @@ public enum Enum1 { //////////////////// -import java.lang.System; - @Anno1() @Anno2(a = @Anno1(), clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class}) @Anno3(value = "value") @@ -93,8 +81,6 @@ public final class TestAnno { //////////////////// -import java.lang.System; - @Anno3(value = "value") @Anno2(i = 6, s = "BCD", ii = {4, 5, 6}, ss = {"Z", "X"}, a = @Anno1(), color = Colors.WHITE, colors = {Colors.WHITE}, clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class}) @kotlin.Metadata() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt index 4d041c037ab..2f1e05c1b49 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @Anno(value = "anno-class") @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() @@ -14,8 +12,6 @@ public abstract @interface Anno { package test; -import java.lang.System; - @kotlin.Metadata() @kotlin.jvm.JvmName(name = "AnnotationsTest") public final class AnnotationsTest { @@ -46,8 +42,6 @@ public final class AnnotationsTest { package test; -import java.lang.System; - @Anno(value = "enum") @kotlin.Metadata() public enum Enum { @@ -71,8 +65,6 @@ public enum Enum { package test; -import java.lang.System; - @Anno(value = "clazz") @kotlin.Metadata() public abstract class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt index 3ee4e7da2e5..06cb8b31a1f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @Anno(value = "anno-class") @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() @@ -14,8 +12,6 @@ public abstract @interface Anno { package test; -import java.lang.System; - @kotlin.Metadata() @kotlin.jvm.JvmName(name = "AnnotationsTest") public final class AnnotationsTest { @@ -46,8 +42,6 @@ public final class AnnotationsTest { package test; -import java.lang.System; - @Anno(value = "enum") @kotlin.Metadata() public enum Enum { @@ -71,8 +65,6 @@ public enum Enum { package test; -import java.lang.System; - @Anno(value = "clazz") @kotlin.Metadata() public abstract class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.txt index 1245f607b7a..6b7c8f6ec80 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class B { @@ -11,8 +9,6 @@ public final class B { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class BParceler implements Parceler { @org.jetbrains.annotations.NotNull() @@ -26,8 +22,6 @@ public final class BParceler implements Parceler { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class C { @@ -39,8 +33,6 @@ public final class C { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class CParceler implements Parceler { @org.jetbrains.annotations.NotNull() @@ -54,8 +46,6 @@ public final class CParceler implements Parceler { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Parceler { } @@ -63,8 +53,6 @@ public abstract interface Parceler { //////////////////// -import java.lang.System; - @kotlin.Metadata() @TypeParceler() @TypeParceler() @@ -78,8 +66,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.PROPERTY}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3_ir.txt index 2f8ae66862d..2db7b6b39f1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class B { @@ -11,8 +9,6 @@ public final class B { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class BParceler implements Parceler { @org.jetbrains.annotations.NotNull() @@ -26,8 +22,6 @@ public final class BParceler implements Parceler { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class C { @@ -39,8 +33,6 @@ public final class C { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class CParceler implements Parceler { @org.jetbrains.annotations.NotNull() @@ -54,8 +46,6 @@ public final class CParceler implements Parceler { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Parceler { } @@ -63,8 +53,6 @@ public abstract interface Parceler { //////////////////// -import java.lang.System; - @kotlin.Metadata() @TypeParceler() @TypeParceler() @@ -78,8 +66,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.PROPERTY}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.txt index b0f6af67cce..f038f1ad6ea 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.txt @@ -1,7 +1,5 @@ package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -57,8 +55,6 @@ public class B { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Bind { @@ -70,8 +66,6 @@ public abstract @interface Bind { package app; -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD}) @@ -85,8 +79,6 @@ public abstract @interface BindField { package app; -import java.lang.System; - @kotlin.Metadata() public final class JJ { @org.jetbrains.annotations.NotNull() @@ -113,8 +105,6 @@ public final class JJ { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MultiValue { @@ -126,8 +116,6 @@ public abstract @interface MultiValue { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MultiValueByte { @@ -139,8 +127,6 @@ public abstract @interface MultiValueByte { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MultiValueString { @@ -152,8 +138,6 @@ public abstract @interface MultiValueString { package app; -import java.lang.System; - @kotlin.Metadata() public final class MyActivity { @BindField(id = lib.R.id.textView) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants_ir.txt index e43bd4fd62e..c8f2e5fb56a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants_ir.txt @@ -1,7 +1,5 @@ package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -57,8 +55,6 @@ public class B { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Bind { @@ -70,8 +66,6 @@ public abstract @interface Bind { package app; -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD}) @@ -85,8 +79,6 @@ public abstract @interface BindField { package app; -import java.lang.System; - @kotlin.Metadata() public final class JJ { @org.jetbrains.annotations.NotNull() @@ -113,8 +105,6 @@ public final class JJ { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MultiValue { @@ -126,8 +116,6 @@ public abstract @interface MultiValue { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MultiValueByte { @@ -139,8 +127,6 @@ public abstract @interface MultiValueByte { package app; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MultiValueString { @@ -152,8 +138,6 @@ public abstract @interface MultiValueString { package app; -import java.lang.System; - @kotlin.Metadata() public final class MyActivity { @BindField(id = lib.R.id.textView) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt index 8287eabf535..d6a07d3cb74 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -8,8 +6,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Bar { @FieldAnno() @@ -35,8 +31,6 @@ public final class Bar { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Baz { @FieldAnno() @@ -57,8 +51,6 @@ public final class Baz { //////////////////// -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD}) @@ -69,8 +61,6 @@ public abstract @interface FieldAnno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { @FieldAnno() @@ -98,8 +88,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.VALUE_PARAMETER}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.PARAMETER}) @@ -110,8 +98,6 @@ public abstract @interface ParameterAnno { //////////////////// -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt index 8a33f84aac1..1fb2c84c929 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno1 { @@ -8,8 +6,6 @@ public abstract @interface Anno1 { //////////////////// -import java.lang.System; - @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno2 { @@ -36,8 +32,6 @@ public abstract @interface Anno2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno3 { @@ -48,8 +42,6 @@ public abstract @interface Anno3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Colors { /*public static final*/ WHITE /* = new Colors() */, @@ -62,8 +54,6 @@ public enum Colors { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Enum1 { /*public static final*/ BLACK /* = new Enum1() */, @@ -77,8 +67,6 @@ public enum Enum1 { //////////////////// -import java.lang.System; - @kotlin.Metadata() @Anno3(value = "value") @Anno2(a = @Anno1(), clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class}) @@ -93,8 +81,6 @@ public final class TestAnno { //////////////////// -import java.lang.System; - @kotlin.Metadata() @Anno2(i = 6, s = "BCD", ii = {4, 5, 6}, ss = {"Z", "X"}, a = @Anno1(), color = Colors.WHITE, colors = {Colors.WHITE}, clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class}) @Anno3(value = "value") diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/anonymousInitializer.txt b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousInitializer.txt index 689a451dab4..35ef20ecdc9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/anonymousInitializer.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousInitializer.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class C { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt index 2f86593274b..b90a139eff2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {}) @@ -10,8 +8,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum EnumError { /*public static final*/ One /* = new EnumError() */, @@ -27,8 +23,6 @@ public enum EnumError { //////////////////// -import java.lang.System; - /** * Obj. */ @@ -45,8 +39,6 @@ public final class Obj { //////////////////// -import java.lang.System; - /** * Test. */ @@ -120,8 +112,6 @@ public final class Test { //////////////////// -import java.lang.System; - /** * Test2 * Multiline @@ -146,8 +136,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - /** * constructor. */ @@ -170,8 +158,6 @@ public final class Test3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test4 { @@ -186,8 +172,6 @@ public final class Test4 { //////////////////// -import java.lang.System; - /** * `/ * Failure * /` */ diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.txt b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.txt index c3b2d02a14f..16e78c85519 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {}) @@ -10,8 +8,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum EnumError { /*public static final*/ One /* = new EnumError() */, @@ -27,8 +23,6 @@ public enum EnumError { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Obj { @org.jetbrains.annotations.NotNull() @@ -42,8 +36,6 @@ public final class Obj { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() @@ -88,8 +80,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test2 { @org.jetbrains.annotations.NotNull() @@ -109,8 +99,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test3 { @org.jetbrains.annotations.NotNull() @@ -130,8 +118,6 @@ public final class Test3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test4 { @@ -146,8 +132,6 @@ public final class Test4 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface TestComponent { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt index fe12ae099ee..7cb7d596334 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {}) @@ -10,8 +8,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum EnumError { /*public static final*/ One /* = new EnumError() */, @@ -27,8 +23,6 @@ public enum EnumError { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Obj { @org.jetbrains.annotations.NotNull() @@ -42,8 +36,6 @@ public final class Obj { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() @@ -88,8 +80,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test2 { @org.jetbrains.annotations.NotNull() @@ -109,8 +99,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test3 { @org.jetbrains.annotations.NotNull() @@ -130,8 +118,6 @@ public final class Test3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test4 { @@ -146,8 +132,6 @@ public final class Test4 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface TestComponent { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt index 0ad7403700a..78cd47d494e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @java.lang.annotation.Target(value = {}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -10,8 +8,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum EnumError { /*public static final*/ One /* = new EnumError() */, @@ -27,8 +23,6 @@ public enum EnumError { //////////////////// -import java.lang.System; - /** * Obj. */ @@ -45,8 +39,6 @@ public final class Obj { //////////////////// -import java.lang.System; - /** * Test. */ @@ -120,8 +112,6 @@ public final class Test { //////////////////// -import java.lang.System; - /** * Test2 * Multiline @@ -146,8 +136,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - /** * constructor. */ @@ -170,8 +158,6 @@ public final class Test3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test4 { @@ -186,8 +172,6 @@ public final class Test4 { //////////////////// -import java.lang.System; - /** * `/ * Failure * /` */ diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.txt index 8fc8924d0d1..c51eb690c91 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class République { @@ -11,8 +9,6 @@ public final class République { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Привет { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt index 8a4001a9e77..37cfe010f6f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class User { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass_ir.txt index 81f948e1f60..e9e4d6c9103 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class User { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt index bb9b88f9eee..636a8b93298 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { @org.jetbrains.annotations.NotNull() @@ -39,8 +37,6 @@ public abstract interface Intf { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface IntfWithDefaultImpls { @@ -62,8 +58,6 @@ public abstract interface IntfWithDefaultImpls { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface IntfWithoutDefaultImpls { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls_ir.txt index 7f7a2bde5c8..589776f2d7c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { public static final int WHITE = 2; @@ -39,8 +37,6 @@ public abstract interface Intf { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface IntfWithDefaultImpls { @@ -62,8 +58,6 @@ public abstract interface IntfWithDefaultImpls { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface IntfWithoutDefaultImpls { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.txt index 057367df29a..792ab18cb2a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class AnotherRootClass { @@ -11,8 +9,6 @@ public final class AnotherRootClass { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class RootClass { @@ -41,8 +37,6 @@ public @interface ClassRefAnnotation { package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface PackedClass { @@ -60,8 +54,6 @@ public abstract interface PackedClass { package test; -import java.lang.System; - @ClassRefAnnotation(value = {RootClass.class}) @kotlin.Metadata() public final class PackedWithAnnotation { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.txt index 6569ce15339..db8d3c763cb 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class AnotherRootClass { @@ -11,8 +9,6 @@ public final class AnotherRootClass { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class RootClass { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt index 9e5d42614b4..cd21ca41f77 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public enum Em { /*public static final*/ FOO /* = new Em() */, @@ -12,8 +10,6 @@ public enum Em { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { private final boolean z = false; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt index e649bb47ecb..04726724644 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public enum Em { /*public static final*/ FOO /* = new Em() */, @@ -12,8 +10,6 @@ public enum Em { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { private final boolean z = false; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt index 24a4c4bb0e4..8b15bfc410d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public enum Em { /*public static final*/ FOO /* = new Em() */, @@ -12,8 +10,6 @@ public enum Em { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { private final boolean z = true; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt index 6de7bd5de5e..d25e13473bb 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public enum Em { /*public static final*/ FOO /* = new Em() */, @@ -12,8 +10,6 @@ public enum Em { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { private final boolean z = true; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.txt index f9a898802ce..f12b98a13d7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class Bar { private final test.Delegate unknown$delegate = null; @@ -20,8 +18,6 @@ public final class Bar { package test; -import java.lang.System; - @kotlin.Metadata() public final class Delegate { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.txt index 8872a27a94d..3e7330da9ef 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class A { @org.jetbrains.annotations.NotNull() @@ -54,8 +52,6 @@ public final class A { package test; -import java.lang.System; - @kotlin.Metadata() public class C { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties_ir.txt index 2d7bb92a0b8..96eb638cf40 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class A { @org.jetbrains.annotations.NotNull() @@ -54,8 +52,6 @@ public final class A { package test; -import java.lang.System; - @kotlin.Metadata() public class C { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt index dac7b872317..59c1b48d2af 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt @@ -1,7 +1,5 @@ package deprecated; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() @java.lang.Deprecated() @@ -12,8 +10,6 @@ public abstract @interface Anno { package deprecated; -import java.lang.System; - @Anno() @kotlin.Metadata() @java.lang.Deprecated() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated_ir.txt index 24368a6ce1a..2bcf7786de3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated_ir.txt @@ -1,7 +1,5 @@ package deprecated; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() @java.lang.Deprecated() @@ -12,8 +10,6 @@ public abstract @interface Anno { package deprecated; -import java.lang.System; - @Anno() @kotlin.Metadata() @java.lang.Deprecated() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt index ffe0217c9a9..c64cd16816e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { private final Test.Companion.Example foo; @@ -30,8 +28,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test2 { private final Test2.Amigo.Example foo; @@ -62,8 +58,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test3 { private final Test3.Amigo.Example foo = Test3.Amigo.Example.FOO; @@ -94,8 +88,6 @@ public final class Test3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test4 { private final int foo = 1; @@ -129,8 +121,6 @@ public final class Test4 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test5 { private final Test5.Amigos.Companion.Goo.Example foo; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt index 75234eb51d4..87623e6ff8d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() @@ -31,8 +29,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test2 { @org.jetbrains.annotations.NotNull() @@ -64,8 +60,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test3 { @org.jetbrains.annotations.NotNull() @@ -97,8 +91,6 @@ public final class Test3 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test4 { private final int foo = 1; @@ -132,8 +124,6 @@ public final class Test4 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test5 { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt index c892e905901..967830b511b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno1 { @@ -10,8 +8,6 @@ public abstract @interface Anno1 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Enum1 { /*public static final*/ BLACK /* = new Enum1() */, @@ -24,8 +20,6 @@ public enum Enum1 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Enum2 { /*public static final*/ RED /* = new Enum2() */, @@ -63,8 +57,6 @@ public enum Enum2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface I { @@ -80,8 +72,6 @@ public abstract interface I { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Nested1 { /*public static final*/ WHITE /* = new Nested1() */; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.txt index 8427a5cf655..1df266b201c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class TypeHook { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt index bc05034f0ac..8291997b9c5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -11,8 +9,6 @@ public abstract @interface Anno { package test; -import java.lang.System; - @Anno() @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt index 2d0abe5d8fb..9870e360a72 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class Child extends kotlin.collections.AbstractList implements test.Parent, java.util.List { @@ -44,8 +42,6 @@ public final class Child extends kotlin.collections.AbstractList { @@ -72,8 +66,6 @@ public final class Generics1 extends Foo { package test; -import java.lang.System; - @kotlin.Metadata() public final class Generics2 implements Foo { @@ -86,8 +78,6 @@ public final class Generics2 implements Foo { package test; -import java.lang.System; - @kotlin.Metadata() public final class Generics3 implements Foo>, java.lang.String> { @@ -100,8 +90,6 @@ public final class Generics3 implements Foo package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { } @@ -110,8 +98,6 @@ public abstract interface Intf { package test; -import java.lang.System; - @kotlin.Metadata() public final class MappedList extends kotlin.collections.AbstractList implements java.util.List { @@ -135,8 +121,6 @@ public final class MappedList extends kotlin.collect package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface Parent { } @@ -145,8 +129,6 @@ public abstract interface Parent extends kotlin.collections.AbstractList implements java.util.List { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters_ir.txt index 54ff14eea2c..60749ca73bf 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class MappedList extends kotlin.collections.AbstractList implements java.util.List { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt index 63525d2d679..43c8168263c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class GenericRawSignatures { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt index f84e05a9a50..77aac3433ed 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface ABC { @@ -16,8 +14,6 @@ public abstract interface ABC { //////////////////// -import java.lang.System; - @kotlin.Metadata() public class BaseClass { @@ -29,8 +25,6 @@ public class BaseClass { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { } @@ -38,8 +32,6 @@ public abstract interface Intf, M extends T> { } @@ -47,8 +39,6 @@ public abstract interface Intf2 extends BaseClass implements Intf, OtherIntf { @org.jetbrains.annotations.Nullable() @@ -67,8 +57,6 @@ public final class MyClass { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt index 660f293bc78..53867d57941 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt index 6d11ec00330..1c2bfd86254 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt @@ -15,8 +15,6 @@ public abstract class Prop { package test; -import java.lang.System; - @kotlin.Metadata() public final class Cl { @org.jetbrains.annotations.NotNull() @@ -41,8 +39,6 @@ public final class Cl { package test; -import java.lang.System; - @kotlin.Metadata() public final class TestKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.txt b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.txt index 179614a37a9..4707f40300c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class GroupedNewsListDelegateAdapter { @@ -12,8 +10,6 @@ public final class GroupedNewsListDelegateAdapter { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class HomeFragment { private final kotlin.Unit categoryNewsListPresenter$delegate = null; @@ -40,8 +36,6 @@ public final class HomeFragment { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class IncorrectDelegateKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate_ir.txt index 7c164e632c2..ee695a068a9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class GroupedNewsListDelegateAdapter { @@ -12,8 +10,6 @@ public final class GroupedNewsListDelegateAdapter { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class HomeFragment { @org.jetbrains.annotations.NotNull() @@ -42,8 +38,6 @@ public final class HomeFragment { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class IncorrectDelegateKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt index a127c24289b..0641260938d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract class BaseClass { @@ -15,8 +13,6 @@ public abstract class BaseClass { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Context { } @@ -24,8 +20,6 @@ public abstract interface Context { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Inheritor extends BaseClass { @@ -44,8 +38,6 @@ public final class Inheritor extends BaseClass { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Result { /*public static final*/ SUCCESS /* = new Result() */, diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt index e4226214a2a..a9df1abc08d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.jvm.JvmInline() @kotlin.Metadata() public final class Cl { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses_ir.txt index 9fc1c865b48..8f66807c596 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.jvm.JvmInline() @kotlin.Metadata() public final class Cl { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt index 009cf058785..cbd97275789 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { private Test.FilterValueDelegate a; @@ -20,8 +18,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test2 { @@ -50,8 +46,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test3 { private Test3.FilterValueDelegate a; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters_ir.txt index a6bab645ca1..238966fe83c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() @@ -21,8 +19,6 @@ public final class Test { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test2 { @@ -52,8 +48,6 @@ public final class Test2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test3 { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt index 909737518f7..7f6f5233be5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Named { @@ -10,8 +8,6 @@ public abstract interface Named { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Product2 implements Named { @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt index 4024c260cf3..9251ad795f2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @Anno(color = Color.InvalidFieldName) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() @@ -11,8 +9,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Color { /*public static final*/ BLACK /* = new Color() */; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt index f0009af9049..a93f52c5781 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt @@ -1,7 +1,5 @@ package a.b.c; -import java.lang.System; - @kotlin.Metadata() public final class A { @@ -14,8 +12,6 @@ public final class A { package a.b.typealias.c; -import java.lang.System; - @kotlin.Metadata() public final class E { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt index cf13a91ae8a..bf2578dd7c5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt @@ -1,7 +1,5 @@ package javadoc; -import java.lang.System; - /** * Simple */ @@ -17,8 +15,6 @@ public final class A { package javadoc; -import java.lang.System; - /** * Multi * line diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt index 8f465117ff3..d9bd6209d0a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Foo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt index 554b8bfcf09..6d8d0b9eef7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Foo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt index 7873b6ac355..e3fcd9f2777 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Foo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt index 7873b6ac355..e3fcd9f2777 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface Foo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt index 96bd8e5a8f2..2ac5c910c96 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class State { private final int someInt = 0; @@ -35,8 +33,6 @@ public final class State { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class State2 { @kotlin.jvm.JvmField() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads_ir.txt index 9915f957fd9..415f1cae695 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class State { private final int someInt = 0; @@ -35,8 +33,6 @@ public final class State { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class State2 { @kotlin.jvm.JvmField() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.txt index e39aa758da7..ea6fbe59242 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @Condition(condition = "value1") @Condition(condition = "value2") @kotlin.Metadata() @@ -13,8 +11,6 @@ public final class A { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Condition { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt index b3e0234db75..e3d100c042f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface FooComponent { @org.jetbrains.annotations.NotNull() @@ -31,8 +29,6 @@ public abstract interface FooComponent { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class JvmStaticTest { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt index a35166291f5..2769f65a7b8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent_ir.txt index e5d3defecc8..a6349d7c324 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic_ir.txt index 9ca73914574..0102168f9a3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface FooComponent { @org.jetbrains.annotations.NotNull() @@ -31,8 +29,6 @@ public abstract interface FooComponent { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class JvmStaticTest { private static final int one = 1; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt index a7516a202c5..fe0d1934cd5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Kt14996Kt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt index 0ee62210cc6..b4071b31cef 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public class CrashMe { private final java.lang.Runnable notReally = null; @@ -12,8 +10,6 @@ public class CrashMe { //////////////////// -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"AMBIGUOUS_ANONYMOUS_TYPE_INFERRED"}) public final class Kt14997Kt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997_ir.txt index 0c4238ee93e..59bb0639f72 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public class CrashMe { @org.jetbrains.annotations.NotNull() @@ -13,8 +11,6 @@ public class CrashMe { //////////////////// -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"AMBIGUOUS_ANONYMOUS_TYPE_INFERRED"}) public final class Kt14997Kt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt index 0110f7603f3..4c3ec630424 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Outer { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt index 841f78e3aa8..e83fd18a317 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface MyInterface { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt index 4a865d9f846..4744a8c9a5d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class MutableEntry implements java.util.Map.Entry, kotlin.jvm.internal.markers.KMutableMap.Entry { private final java.util.Map internal = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567_ir.txt index 0f8c726b24b..371af34f60d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class MutableEntry implements java.util.Map.Entry, kotlin.jvm.internal.markers.KMutableMap.Entry { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt index 563dade3f89..34284ec82db 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Kt18377Kt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt index 96dc6d92509..9d9aa57f579 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract class Foo { @@ -11,8 +9,6 @@ public abstract class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Kt18682Kt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt index 51bea96ef34..a357c1ae126 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface ListUpdateCallback { @@ -12,8 +10,6 @@ public abstract interface ListUpdateCallback { package test; -import java.lang.System; - @kotlin.Metadata() public final class Test { private final test.ListUpdateCallback x = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700_ir.txt index acfd19eb947..2f52306bfe1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface ListUpdateCallback { @@ -12,8 +10,6 @@ public abstract interface ListUpdateCallback { package test; -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt index aa0b1689418..9a062a45135 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class Test { private final test.TypedListUpdateCallback x = null; @@ -15,8 +13,6 @@ public final class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750_ir.txt index b6fde0bbc0b..e0609f574b2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() @@ -16,8 +14,6 @@ public final class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt index f2b7d34d2a1..5e057a966c0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Foo { private final java.lang.String string = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272_ir.txt index a89daf55ca5..1c1d80ec0d5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Foo { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt index 2010763a1d6..01793dfe7e4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt @@ -1,7 +1,5 @@ package kapt; -import java.lang.System; - @kotlin.Metadata() public final class StaticImport { private final java.util.Collection x = null; @@ -58,8 +56,6 @@ public class StaticMethod { package my.lib; -import java.lang.System; - @kotlin.Metadata() public final class LibKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt index b9b0cb2fa43..ea5dcfe8c36 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public abstract class BundleProperty extends test.NullableBundleProperty { @@ -40,8 +38,6 @@ public abstract class BundleProperty extends test.N package test; -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"NOTHING_TO_INLINE"}) public final class Kt27126Kt { @@ -61,8 +57,6 @@ public final class Kt27126Kt { package test; -import java.lang.System; - @kotlin.Metadata() public abstract class NullableBundleProperty implements kotlin.properties.ReadWriteProperty { private final java.lang.String key = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126_ir.txt index 8e809134a21..0fd37bb13e9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public abstract class BundleProperty extends test.NullableBundleProperty { @@ -40,8 +38,6 @@ public abstract class BundleProperty extends test.N package test; -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"NOTHING_TO_INLINE"}) public final class Kt27126Kt { @@ -61,8 +57,6 @@ public final class Kt27126Kt { package test; -import java.lang.System; - @kotlin.Metadata() public abstract class NullableBundleProperty implements kotlin.properties.ReadWriteProperty { @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.txt index 73467767a5e..3d4485782aa 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.txt @@ -1,7 +1,5 @@ package foo; -import java.lang.System; - @kotlin.Metadata() public abstract interface InterfaceWithDefaults { @@ -24,8 +22,6 @@ public abstract interface InterfaceWithDefaults { package foo; -import java.lang.System; - @kotlin.Metadata() public abstract interface SubInterface extends foo.InterfaceWithDefaults { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306_ir.txt index 20ee870ea6f..2b2c91127fc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306_ir.txt @@ -1,7 +1,5 @@ package foo; -import java.lang.System; - @kotlin.Metadata() public abstract interface InterfaceWithDefaults { @@ -24,8 +22,6 @@ public abstract interface InterfaceWithDefaults { package foo; -import java.lang.System; - @kotlin.Metadata() public abstract interface SubInterface extends foo.InterfaceWithDefaults { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt index 482d0e87194..31d73b1ded9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class T implements java.lang.Runnable { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt index 5069d02bbc1..44adf429340 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Foo { private final kotlin.Lazy foo$delegate = null; @@ -31,8 +29,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface GenericIntf { } @@ -40,8 +36,6 @@ public abstract interface GenericIntf { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty_ir.txt index e409f2a65b1..6b76413dbc4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Foo { @org.jetbrains.annotations.NotNull() @@ -35,8 +33,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface GenericIntf { } @@ -44,8 +40,6 @@ public abstract interface GenericIntf { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/leadingDollars.txt b/plugins/kapt3/kapt3-compiler/testData/converter/leadingDollars.txt index 32cfaa38437..e0c772c3bfc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/leadingDollars.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/leadingDollars.txt @@ -33,8 +33,6 @@ public class Test$ { package test; -import java.lang.System; - @kotlin.Metadata() public final class TestKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt index 0238fd42a54..1fab800ca1c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract interface EntryHolder { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt index c8a55f8c834..a14c778ded1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public abstract class Cls { @@ -19,8 +17,6 @@ public abstract class Cls { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface Intf { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt index dad68ddd0ba..df2d6c3409a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class CrashMe { private final int resources = 1; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt index 860f8ef4a82..4bb3e36d5e2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt @@ -1,7 +1,5 @@ package modifiers; -import java.lang.System; - @kotlin.Metadata() public final class InternalClass { @@ -14,8 +12,6 @@ public final class InternalClass { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract interface InternalInterface { } @@ -24,8 +20,6 @@ public abstract interface InternalInterface { package modifiers; -import java.lang.System; - @kotlin.Metadata() public final class Modifiers { @kotlin.jvm.Transient() @@ -82,8 +76,6 @@ public final class Modifiers { package modifiers; -import java.lang.System; - @kotlin.Metadata() final class PrivateClass { @@ -96,8 +88,6 @@ final class PrivateClass { package modifiers; -import java.lang.System; - @kotlin.Metadata() abstract interface PrivateInterface { } @@ -106,8 +96,6 @@ abstract interface PrivateInterface { package modifiers; -import java.lang.System; - @kotlin.Metadata() public final class PublicClass { @@ -120,8 +108,6 @@ public final class PublicClass { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract class PublicClassPrivateConstructor { @@ -134,8 +120,6 @@ public abstract class PublicClassPrivateConstructor { package modifiers; -import java.lang.System; - @kotlin.Metadata() public class PublicClassProtectedConstructor { @@ -156,8 +140,6 @@ public class PublicClassProtectedConstructor { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract interface PublicInterface { } @@ -166,8 +148,6 @@ public abstract interface PublicInterface { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract class SealedClass { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt index 5ea72e31bd6..234ab6779a4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt @@ -1,7 +1,5 @@ package modifiers; -import java.lang.System; - @kotlin.Metadata() public final class InternalClass { @@ -14,8 +12,6 @@ public final class InternalClass { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract interface InternalInterface { } @@ -24,8 +20,6 @@ public abstract interface InternalInterface { package modifiers; -import java.lang.System; - @kotlin.Metadata() public final class Modifiers { @org.jetbrains.annotations.NotNull() @@ -82,8 +76,6 @@ public final class Modifiers { package modifiers; -import java.lang.System; - @kotlin.Metadata() final class PrivateClass { @@ -96,8 +88,6 @@ final class PrivateClass { package modifiers; -import java.lang.System; - @kotlin.Metadata() abstract interface PrivateInterface { } @@ -106,8 +96,6 @@ abstract interface PrivateInterface { package modifiers; -import java.lang.System; - @kotlin.Metadata() public final class PublicClass { @@ -120,8 +108,6 @@ public final class PublicClass { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract class PublicClassPrivateConstructor { @@ -134,8 +120,6 @@ public abstract class PublicClassPrivateConstructor { package modifiers; -import java.lang.System; - @kotlin.Metadata() public class PublicClassProtectedConstructor { @@ -156,8 +140,6 @@ public class PublicClassProtectedConstructor { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract interface PublicInterface { } @@ -166,8 +148,6 @@ public abstract interface PublicInterface { package modifiers; -import java.lang.System; - @kotlin.Metadata() public abstract class SealedClass { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt index 0229ecb99f8..fc411a0e597 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class M1 { @@ -20,8 +18,6 @@ public final class M1 { package test; -import java.lang.System; - @kotlin.Metadata() public final class M2 { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt index bf711ec1789..4c82aa88d5f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class A { @org.jetbrains.annotations.Nullable() @@ -50,8 +48,6 @@ public final class A { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class A2 { @@ -103,8 +99,6 @@ public final class A2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { @@ -116,8 +110,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt index 4840883d329..c63533cb17f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class A$B { @kotlin.jvm.JvmField() @@ -83,8 +81,6 @@ public final class A$B { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Experiment { @@ -150,8 +146,6 @@ public final class Experiment { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { @@ -181,8 +175,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface IFoo { @@ -282,8 +274,6 @@ public class JavaClass { //////////////////// -import java.lang.System; - @IFoo.IBar.Anno(value = {IFoo.IBar.IZoo.class, Foo.Bar.class}) @kotlin.Metadata() public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt index b7ce73f8887..a8108b745c2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class A$B { @kotlin.jvm.JvmField() @@ -83,8 +81,6 @@ public final class A$B { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Experiment { @@ -150,8 +146,6 @@ public final class Experiment { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { @@ -181,8 +175,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public abstract interface IFoo { @@ -282,8 +274,6 @@ public class JavaClass { //////////////////// -import java.lang.System; - @IFoo.IBar.Anno(value = {IFoo.IBar.IZoo.class, Foo.Bar.class}) @kotlin.Metadata() public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt index cd0f400bc3d..46f18b611cd 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class A$B { @kotlin.jvm.JvmField() @@ -86,8 +84,6 @@ public final class A$B { package test; -import java.lang.System; - @kotlin.Metadata() public final class Experiment { @@ -150,8 +146,6 @@ public final class Experiment { package test; -import java.lang.System; - @kotlin.Metadata() public final class Foo { @@ -182,8 +176,6 @@ public final class Foo { package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface IFoo { @@ -286,8 +278,6 @@ class JavaClass { package test; -import java.lang.System; - @test.IFoo.IBar.Anno(value = {test.IFoo.IBar.IZoo.class, test.Foo.Bar.class}) @kotlin.Metadata() public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IFoo.IBar.IZoo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt index ad5bcee4633..d2b149fafd7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class A$B { @kotlin.jvm.JvmField() @@ -86,8 +84,6 @@ public final class A$B { package test; -import java.lang.System; - @kotlin.Metadata() public final class Experiment { @@ -150,8 +146,6 @@ public final class Experiment { package test; -import java.lang.System; - @kotlin.Metadata() public final class Foo { @@ -182,8 +176,6 @@ public final class Foo { package test; -import java.lang.System; - @kotlin.Metadata() public abstract interface IFoo { @@ -286,8 +278,6 @@ class JavaClass { package test; -import java.lang.System; - @test.IFoo.IBar.Anno(value = {test.IFoo.IBar.IZoo.class, test.Foo.Bar.class}) @kotlin.Metadata() public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IFoo.IBar.IZoo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt index 4a197ce3131..c2ee028ab6f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class NonExistentType { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt index 8a545944075..86935614147 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class NonExistentClassWIthoutCorrectionKt { @@ -8,8 +6,6 @@ public final class NonExistentClassWIthoutCorrectionKt { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class NonExistentType { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection_ir.txt index 5ddee3efe05..9201bf3f8e2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class NonExistentClassWIthoutCorrectionKt { @@ -8,8 +6,6 @@ public final class NonExistentClassWIthoutCorrectionKt { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class NonExistentType { @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass_ir.txt index 79cc53d315f..a564bb5d998 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class NonExistentType { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt index 94d1e56a9b7..8a81236442c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class PrimitiveTypes { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes_ir.txt index 6e0f842cd8c..8298f0feb06 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class PrimitiveTypes { public static final boolean booleanFalse = false; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/properties.txt b/plugins/kapt3/kapt3-compiler/testData/converter/properties.txt index 1d2d620c17b..1d2c329aa30 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/properties.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/properties.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt index 8cce201c24a..cb06aec8540 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -8,8 +6,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.CLASS}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE}) @@ -20,8 +16,6 @@ public abstract @interface Anno2 { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt index a710a2da28a..455cb3dd652 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt @@ -21,8 +21,6 @@ import java.lang.annotation.*; package app; -import java.lang.System; - @kotlin.Metadata() public final class KBox implements androidx.annotation.Box { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt index 44203435a25..5b93e0a3410 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoArray { @@ -12,8 +10,6 @@ public abstract @interface AnnoArray { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoBoolean { @@ -26,8 +22,6 @@ public abstract @interface AnnoBoolean { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoChar { @@ -40,8 +34,6 @@ public abstract @interface AnnoChar { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoClass { @@ -54,8 +46,6 @@ public abstract @interface AnnoClass { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoDouble { @@ -68,8 +58,6 @@ public abstract @interface AnnoDouble { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoEnum { @@ -82,8 +70,6 @@ public abstract @interface AnnoEnum { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoFloat { @@ -96,8 +82,6 @@ public abstract @interface AnnoFloat { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoInt { @@ -110,8 +94,6 @@ public abstract @interface AnnoInt { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoIntArray { @@ -124,8 +106,6 @@ public abstract @interface AnnoIntArray { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoLong { @@ -138,8 +118,6 @@ public abstract @interface AnnoLong { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoLongArray { @@ -152,8 +130,6 @@ public abstract @interface AnnoLongArray { //////////////////// -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface AnnoString { @@ -166,8 +142,6 @@ public abstract @interface AnnoString { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum Color { /*public static final*/ BLACK /* = new Color() */; @@ -179,8 +153,6 @@ public enum Color { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() @@ -206,8 +178,6 @@ public final class Test { //////////////////// -import java.lang.System; - @AnnoChar(x = lib.R.id.textView, chr = 'c') @AnnoBoolean(x = lib.R.id.textView, bool = false) @AnnoInt(x = lib.R.id.textView, i = 5) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt index 55c355216a0..5731f7934a0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt @@ -1,7 +1,5 @@ package secondary; -import java.lang.System; - @kotlin.Metadata() public abstract interface Named { @@ -13,8 +11,6 @@ public abstract interface Named { package secondary; -import java.lang.System; - @kotlin.Metadata() public final class Product2 implements secondary.Named { @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt index 34b83b5c60e..34af72c4d62 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt @@ -1,7 +1,5 @@ package test; -import java.lang.System; - @kotlin.Metadata() public final class AKt { @@ -17,8 +15,6 @@ public final class AKt { package test; -import java.lang.System; - @kotlin.Metadata() public final class BKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt index 27881ebd0b9..39a26abc7dd 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -12,8 +10,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum StrangeEnum { /*public static final*/ InvalidFieldName /* = new StrangeEnum() */; @@ -32,8 +28,6 @@ public enum StrangeEnum { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { public java.lang.String simpleName; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt index f1908420327..e7a03836911 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -12,8 +10,6 @@ public abstract @interface Anno { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum StrangeEnum { /*public static final*/ InvalidFieldName /* = new StrangeEnum() */; @@ -32,8 +28,6 @@ public enum StrangeEnum { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Test { public final java.lang.String simpleName = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt index dbb87eba91d..f490b1e2575 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt @@ -1,5 +1,3 @@ -import java.lang.System; - public abstract class BaseClass { public BaseClass(@org.jetbrains.annotations.NotNull() @@ -14,16 +12,12 @@ public abstract class BaseClass { //////////////////// -import java.lang.System; - public abstract interface Context { } //////////////////// -import java.lang.System; - public final class Inheritor extends BaseClass { public Inheritor(@org.jetbrains.annotations.NotNull() @@ -41,8 +35,6 @@ public final class Inheritor extends BaseClass { //////////////////// -import java.lang.System; - public enum Result { /*public static final*/ SUCCESS /* = new Result() */, /*public static final*/ ERROR /* = new Result() */; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.txt index 63864b96398..b594d1a5f65 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName_ir.txt index 247bc978f10..c318450885c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public class Test { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt index 9e928f7c0ea..cfe4df1d7b7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Foo { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt index cc2a8b7b120..b7cfd7fd419 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt @@ -1,7 +1,5 @@ package test.another; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -13,8 +11,6 @@ public abstract @interface Anno { package test.another; -import java.lang.System; - @kotlin.Metadata() public final class TopLevelKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel_ir.txt index f992f9df7af..aeb5c4d162a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel_ir.txt @@ -1,7 +1,5 @@ package test.another; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { @@ -13,8 +11,6 @@ public abstract @interface Anno { package test.another; -import java.lang.System; - @kotlin.Metadata() public final class TopLevelKt { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt index cbcb744c731..dccafed6ed9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Boo { @org.jetbrains.annotations.NotNull() @@ -25,8 +23,6 @@ public final class Boo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { @org.jetbrains.annotations.NotNull() @@ -122,8 +118,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class HavingState { @org.jetbrains.annotations.NotNull() @@ -220,8 +214,6 @@ public final class HavingState { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum State { /*public static final*/ START /* = new State() */, diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt index 1a6d72b9817..59b0215b768 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @kotlin.Metadata() public final class Boo { @org.jetbrains.annotations.NotNull() @@ -25,8 +23,6 @@ public final class Boo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Foo { @org.jetbrains.annotations.NotNull() @@ -122,8 +118,6 @@ public final class Foo { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class HavingState { @org.jetbrains.annotations.NotNull() @@ -220,8 +214,6 @@ public final class HavingState { //////////////////// -import java.lang.System; - @kotlin.Metadata() public enum State { /*public static final*/ START /* = new State() */, diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt index 9aad835494a..e205edd07ce 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - @Anno() @kotlin.Metadata() public final class User { @@ -34,8 +32,6 @@ public final class User { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it_ir.txt index f7eaec5495d..8a483357612 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it_ir.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - @Anno() @kotlin.Metadata() public final class User { @@ -34,8 +32,6 @@ public final class User { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface Anno { diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/ErrorLocationMapping.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/ErrorLocationMapping.it.txt index 7fb78f9dad0..edece345d46 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/ErrorLocationMapping.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/ErrorLocationMapping.it.txt @@ -1,5 +1,3 @@ -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { @@ -8,8 +6,6 @@ public abstract @interface MyAnnotation { //////////////////// -import java.lang.System; - @kotlin.Metadata() public final class Subject { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt index 9715f4164e3..934e2268251 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { @@ -18,8 +16,6 @@ public abstract @interface MyAnnotation { package test; -import java.lang.System; - @kotlin.Metadata() public final class Simple { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt index 4f6ad6483ce..d03a726e7fc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { @@ -18,8 +16,6 @@ public abstract @interface MyAnnotation { package test; -import java.lang.System; - @kotlin.Metadata() public final class Simple { @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt index 0087069c2dc..bbbcef9bbcf 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - @MyAnnotation() @kotlin.Metadata() public final class State { @@ -46,8 +44,6 @@ public final class State { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it_ir.txt index 887730f3beb..385a672a9b8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it_ir.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - @MyAnnotation() @kotlin.Metadata() public final class State { @@ -46,8 +44,6 @@ public final class State { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt index 22b5025544a..e26de658e2c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - /** * KDoc comment. */ @@ -33,8 +31,6 @@ public final class Simple { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { @@ -44,8 +40,6 @@ public abstract @interface MyAnnotation { package test; -import java.lang.System; - @kotlin.Metadata() public enum EnumClass { /*public static final*/ BLACK /* = new BLACK() */, @@ -59,8 +53,6 @@ public enum EnumClass { package test; -import java.lang.System; - @kotlin.Metadata() public enum EnumClass2 { /*public static final*/ WHITE /* = new WHITE(null) */, diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it_ir.txt index d8d4e4af9cb..49af9d24a10 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it_ir.txt @@ -7,8 +7,6 @@ public final class NonExistentClass { package test; -import java.lang.System; - /** * KDoc comment. */ @@ -33,8 +31,6 @@ public final class Simple { package test; -import java.lang.System; - @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.Metadata() public abstract @interface MyAnnotation { @@ -44,8 +40,6 @@ public abstract @interface MyAnnotation { package test; -import java.lang.System; - @kotlin.Metadata() public enum EnumClass { /*public static final*/ BLACK /* = new BLACK() */, @@ -59,8 +53,6 @@ public enum EnumClass { package test; -import java.lang.System; - @kotlin.Metadata() public enum EnumClass2 { /*public static final*/ WHITE /* = new WHITE(null) */,