From 1afe0b9cd0add809e309bbb499b788ec11a4eef7 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Thu, 10 Nov 2022 17:58:00 +0100 Subject: [PATCH] Change kotlinx.metadata.impl package to kotlinx.metadata.internal Same with kotlinx.metadata.jvm.impl package --- .../jvm/api/kotlinx-metadata-jvm.api | 193 +----------------- ...etadata.impl.extensions.MetadataExtensions | 1 - ...ata.internal.extensions.MetadataExtensions | 1 + .../metadata/jvm/KotlinClassMetadata.kt | 7 +- .../metadata/jvm/KotlinModuleMetadata.kt | 2 +- .../JvmMetadataExtensions.kt | 8 +- .../{impl => internal}/jvmExtensionNodes.kt | 6 +- .../jvm/{impl => internal}/jvmWriteUtils.kt | 6 +- .../src/kotlinx/metadata/jvm/jvmExtensions.kt | 2 +- ...ta.internal.extensions.MetadataExtensions} | 0 .../metadata/klib/KlibModuleMetadata.kt | 3 +- .../metadata/klib/impl/klibExtensionNodes.kt | 2 +- .../klib/impl/klibMetadataExtensions.kt | 4 +- .../metadata/klib/impl/klibReadUtils.kt | 2 +- .../kotlinx/metadata/klib/impl/klibReaders.kt | 2 +- .../metadata/klib/impl/klibWriteUtils.kt | 4 +- .../kotlinx/metadata/klib/impl/klibWriters.kt | 2 +- .../internal/common/KotlinCommonMetadata.kt | 2 +- .../extensions/MetadataExtensions.kt | 7 +- .../extensions/extensionNodes.kt | 4 +- .../extensions/extensionUtils.kt | 4 +- .../metadata/{impl => internal}/readUtils.kt | 2 +- .../metadata/{impl => internal}/readers.kt | 6 +- .../metadata/{impl => internal}/writeUtils.kt | 2 +- .../metadata/{impl => internal}/writers.kt | 6 +- .../src/kotlinx/metadata/nodes.kt | 2 +- 26 files changed, 46 insertions(+), 234 deletions(-) delete mode 100644 libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions create mode 100644 libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.internal.extensions.MetadataExtensions rename libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/{impl => internal}/JvmMetadataExtensions.kt (98%) rename libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/{impl => internal}/jvmExtensionNodes.kt (97%) rename libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/{impl => internal}/jvmWriteUtils.kt (80%) rename libraries/kotlinx-metadata/klib/resources/META-INF/services/{kotlinx.metadata.impl.extensions.MetadataExtensions => kotlinx.metadata.internal.extensions.MetadataExtensions} (100%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/extensions/MetadataExtensions.kt (95%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/extensions/extensionNodes.kt (92%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/extensions/extensionUtils.kt (91%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/readUtils.kt (98%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/readers.kt (99%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/writeUtils.kt (99%) rename libraries/kotlinx-metadata/src/kotlinx/metadata/{impl => internal}/writers.kt (99%) diff --git a/libraries/kotlinx-metadata/jvm/api/kotlinx-metadata-jvm.api b/libraries/kotlinx-metadata/jvm/api/kotlinx-metadata-jvm.api index 02f91551854..5e260e7d2e3 100644 --- a/libraries/kotlinx-metadata/jvm/api/kotlinx-metadata-jvm.api +++ b/libraries/kotlinx-metadata/jvm/api/kotlinx-metadata-jvm.api @@ -802,7 +802,7 @@ public final class kotlinx/metadata/KmType : kotlinx/metadata/KmTypeVisitor { public fun visitArgument (ILkotlinx/metadata/KmVariance;)Lkotlinx/metadata/KmTypeVisitor; public fun visitClass (Ljava/lang/String;)V public synthetic fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/KmTypeExtensionVisitor; - public fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/impl/extensions/KmTypeExtension; + public fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/internal/extensions/KmTypeExtension; public fun visitFlexibleTypeUpperBound (ILjava/lang/String;)Lkotlinx/metadata/KmTypeVisitor; public fun visitOuterType (I)Lkotlinx/metadata/KmTypeVisitor; public fun visitStarProjection ()V @@ -1015,189 +1015,6 @@ public abstract class kotlinx/metadata/KmVersionRequirementVisitor { public fun visitVersion (III)V } -public class kotlinx/metadata/impl/ClassWriter : kotlinx/metadata/KmClassVisitor { - public fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;)V - public synthetic fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - protected final fun getC ()Lkotlinx/metadata/impl/WriteContext; - protected final fun getT ()Lkotlinx/metadata/internal/metadata/ProtoBuf$Class$Builder; - public fun visit (ILjava/lang/String;)V - public fun visitCompanionObject (Ljava/lang/String;)V - public fun visitConstructor (I)Lkotlinx/metadata/KmConstructorVisitor; - public fun visitContextReceiverType (I)Lkotlinx/metadata/KmTypeVisitor; - public fun visitEnd ()V - public fun visitEnumEntry (Ljava/lang/String;)V - public fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/KmClassExtensionVisitor; - public synthetic fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/KmDeclarationContainerExtensionVisitor; - public fun visitFunction (ILjava/lang/String;)Lkotlinx/metadata/KmFunctionVisitor; - public fun visitInlineClassUnderlyingPropertyName (Ljava/lang/String;)V - public fun visitInlineClassUnderlyingType (I)Lkotlinx/metadata/KmTypeVisitor; - public fun visitNestedClass (Ljava/lang/String;)V - public fun visitProperty (ILjava/lang/String;II)Lkotlinx/metadata/KmPropertyVisitor; - public fun visitSealedSubclass (Ljava/lang/String;)V - public fun visitSupertype (I)Lkotlinx/metadata/KmTypeVisitor; - public fun visitTypeAlias (ILjava/lang/String;)Lkotlinx/metadata/KmTypeAliasVisitor; - public fun visitTypeParameter (ILjava/lang/String;ILkotlinx/metadata/KmVariance;)Lkotlinx/metadata/KmTypeParameterVisitor; - public fun visitVersionRequirement ()Lkotlinx/metadata/KmVersionRequirementVisitor; -} - -public class kotlinx/metadata/impl/LambdaWriter : kotlinx/metadata/KmLambdaVisitor { - public fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;)V - protected final fun getC ()Lkotlinx/metadata/impl/WriteContext; - protected final fun getT ()Lkotlinx/metadata/internal/metadata/ProtoBuf$Function$Builder; - protected final fun setT (Lkotlinx/metadata/internal/metadata/ProtoBuf$Function$Builder;)V - public fun visitFunction (ILjava/lang/String;)Lkotlinx/metadata/KmFunctionVisitor; -} - -public class kotlinx/metadata/impl/ModuleFragmentWriter : kotlinx/metadata/KmModuleFragmentVisitor { - public fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;)V - public synthetic fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - protected final fun getC ()Lkotlinx/metadata/impl/WriteContext; - protected final fun getT ()Lkotlinx/metadata/internal/metadata/ProtoBuf$PackageFragment$Builder; - public fun visitClass ()Lkotlinx/metadata/KmClassVisitor; - public fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/KmModuleFragmentExtensionVisitor; - public fun visitPackage ()Lkotlinx/metadata/KmPackageVisitor; -} - -public class kotlinx/metadata/impl/PackageWriter : kotlinx/metadata/KmPackageVisitor { - public fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;)V - public synthetic fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - protected final fun getC ()Lkotlinx/metadata/impl/WriteContext; - protected final fun getT ()Lkotlinx/metadata/internal/metadata/ProtoBuf$Package$Builder; - public fun visitEnd ()V - public synthetic fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/KmDeclarationContainerExtensionVisitor; - public fun visitExtensions (Lkotlinx/metadata/KmExtensionType;)Lkotlinx/metadata/KmPackageExtensionVisitor; - public fun visitFunction (ILjava/lang/String;)Lkotlinx/metadata/KmFunctionVisitor; - public fun visitProperty (ILjava/lang/String;II)Lkotlinx/metadata/KmPropertyVisitor; - public fun visitTypeAlias (ILjava/lang/String;)Lkotlinx/metadata/KmTypeAliasVisitor; -} - -public final class kotlinx/metadata/impl/ReadContext { - public fun (Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Lkotlinx/metadata/internal/metadata/deserialization/TypeTable;Lkotlinx/metadata/internal/metadata/deserialization/VersionRequirementTable;Lkotlinx/metadata/impl/ReadContext;Ljava/util/List;)V - public synthetic fun (Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Lkotlinx/metadata/internal/metadata/deserialization/TypeTable;Lkotlinx/metadata/internal/metadata/deserialization/VersionRequirementTable;Lkotlinx/metadata/impl/ReadContext;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun className (I)Ljava/lang/String; - public final fun get (I)Ljava/lang/String; - public final fun getContextExtensions ()Ljava/util/List; - public final fun getStrings ()Lkotlinx/metadata/internal/metadata/deserialization/NameResolver; - public final fun getTypeParameterId (I)Ljava/lang/Integer; - public final fun getTypes ()Lkotlinx/metadata/internal/metadata/deserialization/TypeTable; - public final fun withTypeParameters (Ljava/util/List;)Lkotlinx/metadata/impl/ReadContext; -} - -public abstract interface class kotlinx/metadata/impl/ReadContextExtension { -} - -public final class kotlinx/metadata/impl/ReadUtilsKt { - public static final fun readAnnotation (Lkotlinx/metadata/internal/metadata/ProtoBuf$Annotation;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;)Lkotlinx/metadata/KmAnnotation; - public static final fun readAnnotationArgument (Lkotlinx/metadata/internal/metadata/ProtoBuf$Annotation$Argument$Value;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;)Lkotlinx/metadata/KmAnnotationArgument; -} - -public final class kotlinx/metadata/impl/ReadersKt { - public static final fun accept (Lkotlinx/metadata/internal/metadata/ProtoBuf$Class;Lkotlinx/metadata/KmClassVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Ljava/util/List;)V - public static final fun accept (Lkotlinx/metadata/internal/metadata/ProtoBuf$Function;Lkotlinx/metadata/KmLambdaVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;)V - public static final fun accept (Lkotlinx/metadata/internal/metadata/ProtoBuf$Package;Lkotlinx/metadata/KmPackageVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Ljava/util/List;)V - public static final fun accept (Lkotlinx/metadata/internal/metadata/ProtoBuf$PackageFragment;Lkotlinx/metadata/KmModuleFragmentVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Ljava/util/List;)V - public static final fun accept (Lkotlinx/metadata/internal/metadata/ProtoBuf$Property;Lkotlinx/metadata/KmPropertyVisitor;Lkotlinx/metadata/impl/ReadContext;)V - public static synthetic fun accept$default (Lkotlinx/metadata/internal/metadata/ProtoBuf$Class;Lkotlinx/metadata/KmClassVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Ljava/util/List;ILjava/lang/Object;)V - public static synthetic fun accept$default (Lkotlinx/metadata/internal/metadata/ProtoBuf$Package;Lkotlinx/metadata/KmPackageVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Ljava/util/List;ILjava/lang/Object;)V - public static synthetic fun accept$default (Lkotlinx/metadata/internal/metadata/ProtoBuf$PackageFragment;Lkotlinx/metadata/KmModuleFragmentVisitor;Lkotlinx/metadata/internal/metadata/deserialization/NameResolver;Ljava/util/List;ILjava/lang/Object;)V - public static final fun getPropertyGetterFlags (Lkotlinx/metadata/internal/metadata/ProtoBuf$Property;)I - public static final fun getPropertySetterFlags (Lkotlinx/metadata/internal/metadata/ProtoBuf$Property;)I -} - -public class kotlinx/metadata/impl/WriteContext { - public fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;)V - public synthetic fun (Lkotlinx/metadata/internal/metadata/serialization/StringTable;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun get (Ljava/lang/String;)I - public final fun getClassName (Ljava/lang/String;)I - public final fun getContextExtensions ()Ljava/util/List; - public final fun getStrings ()Lkotlinx/metadata/internal/metadata/serialization/StringTable; - public final fun getVersionRequirements ()Lkotlinx/metadata/internal/metadata/serialization/MutableVersionRequirementTable; -} - -public abstract interface class kotlinx/metadata/impl/WriteContextExtension { -} - -public final class kotlinx/metadata/impl/WriteUtilsKt { - public static final fun writeAnnotation (Lkotlinx/metadata/KmAnnotation;Lkotlinx/metadata/internal/metadata/serialization/StringTable;)Lkotlinx/metadata/internal/metadata/ProtoBuf$Annotation$Builder; - public static final fun writeAnnotationArgument (Lkotlinx/metadata/KmAnnotationArgument;Lkotlinx/metadata/internal/metadata/serialization/StringTable;)Lkotlinx/metadata/internal/metadata/ProtoBuf$Annotation$Argument$Value$Builder; -} - -public final class kotlinx/metadata/impl/WritersKt { - public static final fun writeProperty (Lkotlinx/metadata/impl/WriteContext;ILjava/lang/String;IILkotlin/jvm/functions/Function1;)Lkotlinx/metadata/KmPropertyVisitor; -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmClassExtension : kotlinx/metadata/KmClassExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmConstructorExtension : kotlinx/metadata/KmConstructorExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmExtension : kotlinx/metadata/KmExtensionVisitor { - public abstract fun accept (Lkotlinx/metadata/KmExtensionVisitor;)V -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmFunctionExtension : kotlinx/metadata/KmFunctionExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmModuleFragmentExtension : kotlinx/metadata/KmModuleFragmentExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmPackageExtension : kotlinx/metadata/KmPackageExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmPropertyExtension : kotlinx/metadata/KmPropertyExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmTypeAliasExtension : kotlinx/metadata/KmTypeAliasExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmTypeExtension : kotlinx/metadata/KmTypeExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmTypeParameterExtension : kotlinx/metadata/KmTypeParameterExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/KmValueParameterExtension : kotlinx/metadata/KmValueParameterExtensionVisitor, kotlinx/metadata/impl/extensions/KmExtension { -} - -public abstract interface class kotlinx/metadata/impl/extensions/MetadataExtensions { - public static final field Companion Lkotlinx/metadata/impl/extensions/MetadataExtensions$Companion; - public abstract fun createClassExtension ()Lkotlinx/metadata/impl/extensions/KmClassExtension; - public abstract fun createConstructorExtension ()Lkotlinx/metadata/impl/extensions/KmConstructorExtension; - public abstract fun createFunctionExtension ()Lkotlinx/metadata/impl/extensions/KmFunctionExtension; - public abstract fun createModuleFragmentExtensions ()Lkotlinx/metadata/impl/extensions/KmModuleFragmentExtension; - public abstract fun createPackageExtension ()Lkotlinx/metadata/impl/extensions/KmPackageExtension; - public abstract fun createPropertyExtension ()Lkotlinx/metadata/impl/extensions/KmPropertyExtension; - public abstract fun createTypeAliasExtension ()Lkotlinx/metadata/impl/extensions/KmTypeAliasExtension; - public abstract fun createTypeExtension ()Lkotlinx/metadata/impl/extensions/KmTypeExtension; - public abstract fun createTypeParameterExtension ()Lkotlinx/metadata/impl/extensions/KmTypeParameterExtension; - public abstract fun createValueParameterExtension ()Lkotlinx/metadata/impl/extensions/KmValueParameterExtension; - public abstract fun readClassExtensions (Lkotlinx/metadata/KmClassVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$Class;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readConstructorExtensions (Lkotlinx/metadata/KmConstructorVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$Constructor;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readFunctionExtensions (Lkotlinx/metadata/KmFunctionVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$Function;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readModuleFragmentExtensions (Lkotlinx/metadata/KmModuleFragmentVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$PackageFragment;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readPackageExtensions (Lkotlinx/metadata/KmPackageVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$Package;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readPropertyExtensions (Lkotlinx/metadata/KmPropertyVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$Property;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readTypeAliasExtensions (Lkotlinx/metadata/KmTypeAliasVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$TypeAlias;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readTypeExtensions (Lkotlinx/metadata/KmTypeVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$Type;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readTypeParameterExtensions (Lkotlinx/metadata/KmTypeParameterVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$TypeParameter;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun readValueParameterExtensions (Lkotlinx/metadata/KmValueParameterVisitor;Lkotlinx/metadata/internal/metadata/ProtoBuf$ValueParameter;Lkotlinx/metadata/impl/ReadContext;)V - public abstract fun writeClassExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$Class$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmClassExtensionVisitor; - public abstract fun writeConstructorExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$Constructor$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmConstructorExtensionVisitor; - public abstract fun writeFunctionExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$Function$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmFunctionExtensionVisitor; - public abstract fun writeModuleFragmentExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$PackageFragment$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmModuleFragmentExtensionVisitor; - public abstract fun writePackageExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$Package$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmPackageExtensionVisitor; - public abstract fun writePropertyExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$Property$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmPropertyExtensionVisitor; - public abstract fun writeTypeAliasExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$TypeAlias$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmTypeAliasExtensionVisitor; - public abstract fun writeTypeExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$Type$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmTypeExtensionVisitor; - public abstract fun writeTypeParameterExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$TypeParameter$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmTypeParameterExtensionVisitor; - public abstract fun writeValueParameterExtensions (Lkotlinx/metadata/KmExtensionType;Lkotlinx/metadata/internal/metadata/ProtoBuf$ValueParameter$Builder;Lkotlinx/metadata/impl/WriteContext;)Lkotlinx/metadata/KmValueParameterExtensionVisitor; -} - -public final class kotlinx/metadata/impl/extensions/MetadataExtensions$Companion { - public final fun getINSTANCES ()Ljava/util/List; -} - public class kotlinx/metadata/jvm/JvmClassExtensionVisitor : kotlinx/metadata/jvm/JvmDeclarationContainerExtensionVisitor, kotlinx/metadata/KmClassExtensionVisitor { public static final field Companion Lkotlinx/metadata/jvm/JvmClassExtensionVisitor$Companion; public static final field TYPE Lkotlinx/metadata/KmExtensionType; @@ -1468,7 +1285,7 @@ public final class kotlinx/metadata/jvm/KotlinClassMetadata$Class : kotlinx/meta public final fun toKmClass ()Lkotlinx/metadata/KmClass; } -public final class kotlinx/metadata/jvm/KotlinClassMetadata$Class$Writer : kotlinx/metadata/impl/ClassWriter { +public final class kotlinx/metadata/jvm/KotlinClassMetadata$Class$Writer : kotlinx/metadata/internal/ClassWriter { public fun ()V public final fun write ()Lkotlinx/metadata/jvm/KotlinClassMetadata$Class; public final fun write ([I)Lkotlinx/metadata/jvm/KotlinClassMetadata$Class; @@ -1497,7 +1314,7 @@ public final class kotlinx/metadata/jvm/KotlinClassMetadata$FileFacade : kotlinx public final fun toKmPackage ()Lkotlinx/metadata/KmPackage; } -public final class kotlinx/metadata/jvm/KotlinClassMetadata$FileFacade$Writer : kotlinx/metadata/impl/PackageWriter { +public final class kotlinx/metadata/jvm/KotlinClassMetadata$FileFacade$Writer : kotlinx/metadata/internal/PackageWriter { public fun ()V public final fun write ()Lkotlinx/metadata/jvm/KotlinClassMetadata$FileFacade; public final fun write ([I)Lkotlinx/metadata/jvm/KotlinClassMetadata$FileFacade; @@ -1523,7 +1340,7 @@ public final class kotlinx/metadata/jvm/KotlinClassMetadata$MultiFileClassPart : public final fun toKmPackage ()Lkotlinx/metadata/KmPackage; } -public final class kotlinx/metadata/jvm/KotlinClassMetadata$MultiFileClassPart$Writer : kotlinx/metadata/impl/PackageWriter { +public final class kotlinx/metadata/jvm/KotlinClassMetadata$MultiFileClassPart$Writer : kotlinx/metadata/internal/PackageWriter { public fun ()V public final fun write (Ljava/lang/String;)Lkotlinx/metadata/jvm/KotlinClassMetadata$MultiFileClassPart; public final fun write (Ljava/lang/String;[I)Lkotlinx/metadata/jvm/KotlinClassMetadata$MultiFileClassPart; @@ -1537,7 +1354,7 @@ public final class kotlinx/metadata/jvm/KotlinClassMetadata$SyntheticClass : kot public final fun toKmLambda ()Lkotlinx/metadata/KmLambda; } -public final class kotlinx/metadata/jvm/KotlinClassMetadata$SyntheticClass$Writer : kotlinx/metadata/impl/LambdaWriter { +public final class kotlinx/metadata/jvm/KotlinClassMetadata$SyntheticClass$Writer : kotlinx/metadata/internal/LambdaWriter { public fun ()V public final fun write ()Lkotlinx/metadata/jvm/KotlinClassMetadata$SyntheticClass; public final fun write ([I)Lkotlinx/metadata/jvm/KotlinClassMetadata$SyntheticClass; diff --git a/libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions b/libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions deleted file mode 100644 index 7ac2235c4e0..00000000000 --- a/libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions +++ /dev/null @@ -1 +0,0 @@ -kotlinx.metadata.jvm.impl.JvmMetadataExtensions diff --git a/libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.internal.extensions.MetadataExtensions b/libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.internal.extensions.MetadataExtensions new file mode 100644 index 00000000000..b7bbf6964c0 --- /dev/null +++ b/libraries/kotlinx-metadata/jvm/resources/META-INF/services/kotlinx.metadata.internal.extensions.MetadataExtensions @@ -0,0 +1 @@ +kotlinx.metadata.jvm.internal.JvmMetadataExtensions diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinClassMetadata.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinClassMetadata.kt index bbe4641fab3..6bd65c7842c 100644 --- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinClassMetadata.kt +++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinClassMetadata.kt @@ -7,11 +7,8 @@ package kotlinx.metadata.jvm import kotlinx.metadata.* -import kotlinx.metadata.impl.ClassWriter -import kotlinx.metadata.impl.LambdaWriter -import kotlinx.metadata.impl.PackageWriter -import kotlinx.metadata.impl.accept -import kotlinx.metadata.jvm.impl.writeProtoBufData +import kotlinx.metadata.internal.* +import kotlinx.metadata.jvm.internal.* import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil import org.jetbrains.kotlin.metadata.jvm.serialization.JvmStringTable diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinModuleMetadata.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinModuleMetadata.kt index aa6a9a409d0..f222b0cc396 100644 --- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinModuleMetadata.kt +++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/KotlinModuleMetadata.kt @@ -8,7 +8,7 @@ package kotlinx.metadata.jvm import kotlinx.metadata.* -import kotlinx.metadata.impl.accept +import kotlinx.metadata.internal.accept import kotlinx.metadata.jvm.internal.IgnoreInApiDump import kotlinx.metadata.jvm.KotlinClassMetadata.Companion.COMPATIBLE_METADATA_VERSION import org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmMetadataExtensions.kt similarity index 98% rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmMetadataExtensions.kt index 637a38805b2..c6b54d79fd8 100644 --- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt +++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmMetadataExtensions.kt @@ -1,13 +1,13 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package kotlinx.metadata.jvm.impl +package kotlinx.metadata.jvm.internal import kotlinx.metadata.* -import kotlinx.metadata.impl.* -import kotlinx.metadata.impl.extensions.* +import kotlinx.metadata.internal.* +import kotlinx.metadata.internal.extensions.* import kotlinx.metadata.jvm.* import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/jvmExtensionNodes.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExtensionNodes.kt similarity index 97% rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/jvmExtensionNodes.kt rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExtensionNodes.kt index 5b4239309eb..1aa52d7ab5c 100644 --- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/jvmExtensionNodes.kt +++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExtensionNodes.kt @@ -1,13 +1,13 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @file:Suppress("DEPRECATION") -package kotlinx.metadata.jvm.impl +package kotlinx.metadata.jvm.internal import kotlinx.metadata.* -import kotlinx.metadata.impl.extensions.* +import kotlinx.metadata.internal.extensions.* import kotlinx.metadata.jvm.* internal val KmClass.jvm: JvmClassExtension diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/jvmWriteUtils.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmWriteUtils.kt similarity index 80% rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/jvmWriteUtils.kt rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmWriteUtils.kt index 1c9d97ef267..0db971d1ed6 100644 --- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/jvmWriteUtils.kt +++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmWriteUtils.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package kotlinx.metadata.jvm.impl +package kotlinx.metadata.jvm.internal -import kotlinx.metadata.impl.WriteContext +import kotlinx.metadata.internal.WriteContext import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil import org.jetbrains.kotlin.metadata.jvm.serialization.JvmStringTable import org.jetbrains.kotlin.protobuf.MessageLite diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt index 7198e7492b4..643042ffe40 100644 --- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt +++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt @@ -8,7 +8,7 @@ package kotlinx.metadata.jvm import kotlinx.metadata.* -import kotlinx.metadata.jvm.impl.jvm +import kotlinx.metadata.jvm.internal.jvm /** * Metadata of local delegated properties used somewhere inside this class (but not in a nested class). diff --git a/libraries/kotlinx-metadata/klib/resources/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions b/libraries/kotlinx-metadata/klib/resources/META-INF/services/kotlinx.metadata.internal.extensions.MetadataExtensions similarity index 100% rename from libraries/kotlinx-metadata/klib/resources/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions rename to libraries/kotlinx-metadata/klib/resources/META-INF/services/kotlinx.metadata.internal.extensions.MetadataExtensions diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt index 0bcec2fc9d7..0176add630c 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt @@ -8,8 +8,7 @@ package kotlinx.metadata.klib import kotlinx.metadata.KmAnnotation import kotlinx.metadata.KmModuleFragment -import kotlinx.metadata.impl.WriteContext -import kotlinx.metadata.impl.accept +import kotlinx.metadata.internal.* import kotlinx.metadata.klib.impl.* import org.jetbrains.kotlin.library.metadata.parseModuleHeader import org.jetbrains.kotlin.library.metadata.parsePackageFragment diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibExtensionNodes.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibExtensionNodes.kt index 4ae91028f7d..2e754eb045a 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibExtensionNodes.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibExtensionNodes.kt @@ -7,7 +7,7 @@ package kotlinx.metadata.klib.impl import kotlinx.metadata.* -import kotlinx.metadata.impl.extensions.* +import kotlinx.metadata.internal.extensions.* import kotlinx.metadata.klib.* internal val KmFunction.klibExtensions: KlibFunctionExtension diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt index 327f8205502..a46e7878c4c 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt @@ -6,8 +6,8 @@ package kotlinx.metadata.klib.impl import kotlinx.metadata.* -import kotlinx.metadata.impl.* -import kotlinx.metadata.impl.extensions.* +import kotlinx.metadata.internal.* +import kotlinx.metadata.internal.extensions.* import kotlinx.metadata.klib.* import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.metadata.ProtoBuf diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReadUtils.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReadUtils.kt index 6b8fa5945e2..cfad20ba051 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReadUtils.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReadUtils.kt @@ -5,7 +5,7 @@ package kotlinx.metadata.klib.impl -import kotlinx.metadata.impl.readAnnotation +import kotlinx.metadata.internal.readAnnotation import kotlinx.metadata.klib.KlibHeader import kotlinx.metadata.klib.KlibSourceFile import kotlinx.metadata.klib.UniqId diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReaders.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReaders.kt index 00acd678ae8..1e66b43c313 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReaders.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibReaders.kt @@ -5,7 +5,7 @@ package kotlinx.metadata.klib.impl -import kotlinx.metadata.impl.ReadContextExtension +import kotlinx.metadata.internal.ReadContextExtension import kotlinx.metadata.klib.KlibSourceFile class SourceFileIndexReadExtension( diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriteUtils.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriteUtils.kt index da05a208803..6d829b1935c 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriteUtils.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriteUtils.kt @@ -5,8 +5,8 @@ package kotlinx.metadata.klib.impl -import kotlinx.metadata.impl.WriteContext -import kotlinx.metadata.impl.writeAnnotation +import kotlinx.metadata.internal.WriteContext +import kotlinx.metadata.internal.writeAnnotation import kotlinx.metadata.klib.KlibHeader import kotlinx.metadata.klib.KlibSourceFile import kotlinx.metadata.klib.UniqId diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt index 65d5ad1ba55..c08b7f1f8e6 100644 --- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt +++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt @@ -6,7 +6,7 @@ package kotlinx.metadata.klib.impl -import kotlinx.metadata.impl.* +import kotlinx.metadata.internal.* import kotlinx.metadata.klib.KlibSourceFile import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.metadata.ProtoBuf diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/common/KotlinCommonMetadata.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/common/KotlinCommonMetadata.kt index 8d78b0283d1..c67c1c9002c 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/common/KotlinCommonMetadata.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/common/KotlinCommonMetadata.kt @@ -8,7 +8,7 @@ package kotlinx.metadata.internal.common import kotlinx.metadata.KmModuleFragment import kotlinx.metadata.KmModuleFragmentVisitor -import kotlinx.metadata.impl.accept +import kotlinx.metadata.internal.accept import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.builtins.readBuiltinsPackageFragment import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/MetadataExtensions.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/MetadataExtensions.kt similarity index 95% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/MetadataExtensions.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/MetadataExtensions.kt index c689a08579f..f9aae3cf5c3 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/MetadataExtensions.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/MetadataExtensions.kt @@ -1,13 +1,12 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package kotlinx.metadata.impl.extensions +package kotlinx.metadata.internal.extensions import kotlinx.metadata.* -import kotlinx.metadata.impl.ReadContext -import kotlinx.metadata.impl.WriteContext +import kotlinx.metadata.internal.* import org.jetbrains.kotlin.metadata.ProtoBuf import java.util.* diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/extensionNodes.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionNodes.kt similarity index 92% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/extensionNodes.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionNodes.kt index f61a53510a7..c2fc525c224 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/extensionNodes.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionNodes.kt @@ -1,10 +1,10 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @file:Suppress("DEPRECATION") -package kotlinx.metadata.impl.extensions +package kotlinx.metadata.internal.extensions import kotlinx.metadata.* diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/extensionUtils.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionUtils.kt similarity index 91% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/extensionUtils.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionUtils.kt index 5234970d82e..4944ee26c08 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/extensions/extensionUtils.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionUtils.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @file:Suppress("DEPRECATION") -package kotlinx.metadata.impl.extensions +package kotlinx.metadata.internal.extensions import kotlinx.metadata.KmExtensionType import kotlinx.metadata.KmExtensionVisitor diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/readUtils.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readUtils.kt similarity index 98% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/readUtils.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readUtils.kt index 0cb137442ad..e6c4c9a102a 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/readUtils.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readUtils.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package kotlinx.metadata.impl +package kotlinx.metadata.internal import kotlinx.metadata.ClassName import kotlinx.metadata.KmAnnotation diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/readers.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readers.kt similarity index 99% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/readers.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readers.kt index 6878e01f89c..ff4a60409ac 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/readers.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readers.kt @@ -1,14 +1,14 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @file:Suppress("DEPRECATION") -package kotlinx.metadata.impl +package kotlinx.metadata.internal import kotlinx.metadata.* import kotlinx.metadata.Flags // Don't remove this import. See KT-45553 -import kotlinx.metadata.impl.extensions.MetadataExtensions +import kotlinx.metadata.internal.extensions.MetadataExtensions import kotlinx.metadata.internal.IgnoreInApiDump import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.* diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writeUtils.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writeUtils.kt similarity index 99% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writeUtils.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writeUtils.kt index d4ccd6b03fb..7dc1a616d1b 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writeUtils.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writeUtils.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package kotlinx.metadata.impl +package kotlinx.metadata.internal import kotlinx.metadata.ClassName import kotlinx.metadata.KmAnnotation diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writers.kt similarity index 99% rename from libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writers.kt index 9a998aa7fbc..4a54209b748 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writers.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @file:Suppress("DEPRECATION") -package kotlinx.metadata.impl +package kotlinx.metadata.internal import kotlinx.metadata.* -import kotlinx.metadata.impl.extensions.applySingleExtension +import kotlinx.metadata.internal.extensions.applySingleExtension import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.VersionRequirement import org.jetbrains.kotlin.metadata.serialization.MutableVersionRequirementTable diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/nodes.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/nodes.kt index 30b385b333c..4d9e7cbba0a 100644 --- a/libraries/kotlinx-metadata/src/kotlinx/metadata/nodes.kt +++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/nodes.kt @@ -7,7 +7,7 @@ package kotlinx.metadata -import kotlinx.metadata.impl.extensions.* +import kotlinx.metadata.internal.extensions.* import kotlin.contracts.ExperimentalContracts /**