diff --git a/build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java index c1d3bae0d0c..db56179ff4e 100644 --- a/build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: konan/serializer/src/konan.debug.proto +// source: konan/library-reader/src/konan.debug.proto package org.jetbrains.kotlin.metadata.konan; @@ -4084,71 +4084,71 @@ public final class DebugKonanProtoBuf { descriptor; static { java.lang.String[] descriptorData = { - "\n&konan/serializer/src/konan.debug.proto" + - "\022#org.jetbrains.kotlin.metadata.konan\032&c" + - "ore/metadata/src/metadata.debug.proto\"\"\n" + - "\014InlineIrBody\022\022\n\nencoded_ir\030\013 \002(\t\"\305\002\n\027Li" + - "nkDataPackageFragment\022\017\n\007fq_name\030\001 \002(\t\0227" + - "\n\007package\030\004 \002(\0132&.org.jetbrains.kotlin.m" + - "etadata.Package\022E\n\007classes\030\005 \002(\01324.org.j" + - "etbrains.kotlin.metadata.konan.LinkDataC" + - "lasses\022\020\n\010is_empty\030\006 \002(\010\022E\n\nname_table\030\002" + - " \002(\01321.org.jetbrains.kotlin.metadata.Qua", - "lifiedNameTable\022@\n\014string_table\030\003 \002(\0132*." + - "org.jetbrains.kotlin.metadata.StringTabl" + - "e\"\\\n\017LinkDataClasses\022\022\n\nclass_name\030\001 \003(\005" + - "\0225\n\007classes\030\002 \003(\0132$.org.jetbrains.kotlin" + - ".metadata.Class\"\\\n\017LinkDataLibrary\022\023\n\013mo" + - "dule_name\030\001 \002(\t\022\035\n\025package_fragment_name" + - "\030\002 \003(\t\022\025\n\rempty_package\030\003 \003(\t:@\n\017package" + - "_fq_name\022&.org.jetbrains.kotlin.metadata" + - ".Package\030\253\001 \001(\005:j\n\020class_annotation\022$.or" + - "g.jetbrains.kotlin.metadata.Class\030\252\001 \003(\013", - "2).org.jetbrains.kotlin.metadata.Annotat" + - "ion:v\n\026constructor_annotation\022*.org.jetb" + - "rains.kotlin.metadata.Constructor\030\252\001 \003(\013" + - "2).org.jetbrains.kotlin.metadata.Annotat" + - "ion:\202\001\n\032inline_constructor_ir_body\022*.org" + - ".jetbrains.kotlin.metadata.Constructor\030\253" + - "\001 \001(\01321.org.jetbrains.kotlin.metadata.ko" + - "nan.InlineIrBody:p\n\023function_annotation\022" + - "\'.org.jetbrains.kotlin.metadata.Function" + - "\030\252\001 \003(\0132).org.jetbrains.kotlin.metadata.", - "Annotation:s\n\016inline_ir_body\022\'.org.jetbr" + - "ains.kotlin.metadata.Function\030\253\001 \001(\01321.o" + - "rg.jetbrains.kotlin.metadata.konan.Inlin" + - "eIrBody:p\n\023property_annotation\022\'.org.jet" + - "brains.kotlin.metadata.Property\030\252\001 \003(\0132)" + - ".org.jetbrains.kotlin.metadata.Annotatio" + - "n:C\n\021has_backing_field\022\'.org.jetbrains.k" + - "otlin.metadata.Property\030\253\001 \001(\010:B\n\020used_a" + - "s_variable\022\'.org.jetbrains.kotlin.metada" + - "ta.Property\030\254\001 \001(\010:~\n\022compile_time_value", - "\022\'.org.jetbrains.kotlin.metadata.Propert" + - "y\030\255\001 \001(\01328.org.jetbrains.kotlin.metadata" + - ".Annotation.Argument.Value:z\n\025inline_get" + - "ter_ir_body\022\'.org.jetbrains.kotlin.metad" + - "ata.Property\030\256\001 \001(\01321.org.jetbrains.kotl" + - "in.metadata.konan.InlineIrBody:z\n\025inline" + - "_setter_ir_body\022\'.org.jetbrains.kotlin.m" + - "etadata.Property\030\257\001 \001(\01321.org.jetbrains." + - "kotlin.metadata.konan.InlineIrBody:s\n\025en" + - "um_entry_annotation\022(.org.jetbrains.kotl", - "in.metadata.EnumEntry\030\252\001 \003(\0132).org.jetbr" + - "ains.kotlin.metadata.Annotation:E\n\022enum_" + - "entry_ordinal\022(.org.jetbrains.kotlin.met" + - "adata.EnumEntry\030\253\001 \001(\005:w\n\024parameter_anno" + - "tation\022-.org.jetbrains.kotlin.metadata.V" + - "alueParameter\030\252\001 \003(\0132).org.jetbrains.kot" + - "lin.metadata.Annotation:h\n\017type_annotati" + - "on\022#.org.jetbrains.kotlin.metadata.Type\030" + - "\252\001 \003(\0132).org.jetbrains.kotlin.metadata.A" + - "nnotation:7\n\ttype_text\022#.org.jetbrains.k", - "otlin.metadata.Type\030\254\001 \001(\t:{\n\031type_param" + - "eter_annotation\022,.org.jetbrains.kotlin.m" + - "etadata.TypeParameter\030\252\001 \003(\0132).org.jetbr" + - "ains.kotlin.metadata.AnnotationB\024B\022Debug" + - "KonanProtoBuf" + "\n*konan/library-reader/src/konan.debug.p" + + "roto\022#org.jetbrains.kotlin.metadata.kona" + + "n\032&core/metadata/src/metadata.debug.prot" + + "o\"\"\n\014InlineIrBody\022\022\n\nencoded_ir\030\013 \002(\t\"\305\002" + + "\n\027LinkDataPackageFragment\022\017\n\007fq_name\030\001 \002" + + "(\t\0227\n\007package\030\004 \002(\0132&.org.jetbrains.kotl" + + "in.metadata.Package\022E\n\007classes\030\005 \002(\01324.o" + + "rg.jetbrains.kotlin.metadata.konan.LinkD" + + "ataClasses\022\020\n\010is_empty\030\006 \002(\010\022E\n\nname_tab" + + "le\030\002 \002(\01321.org.jetbrains.kotlin.metadata", + ".QualifiedNameTable\022@\n\014string_table\030\003 \002(" + + "\0132*.org.jetbrains.kotlin.metadata.String" + + "Table\"\\\n\017LinkDataClasses\022\022\n\nclass_name\030\001" + + " \003(\005\0225\n\007classes\030\002 \003(\0132$.org.jetbrains.ko" + + "tlin.metadata.Class\"\\\n\017LinkDataLibrary\022\023" + + "\n\013module_name\030\001 \002(\t\022\035\n\025package_fragment_" + + "name\030\002 \003(\t\022\025\n\rempty_package\030\003 \003(\t:@\n\017pac" + + "kage_fq_name\022&.org.jetbrains.kotlin.meta" + + "data.Package\030\253\001 \001(\005:j\n\020class_annotation\022" + + "$.org.jetbrains.kotlin.metadata.Class\030\252\001", + " \003(\0132).org.jetbrains.kotlin.metadata.Ann" + + "otation:v\n\026constructor_annotation\022*.org." + + "jetbrains.kotlin.metadata.Constructor\030\252\001" + + " \003(\0132).org.jetbrains.kotlin.metadata.Ann" + + "otation:\202\001\n\032inline_constructor_ir_body\022*" + + ".org.jetbrains.kotlin.metadata.Construct" + + "or\030\253\001 \001(\01321.org.jetbrains.kotlin.metadat" + + "a.konan.InlineIrBody:p\n\023function_annotat" + + "ion\022\'.org.jetbrains.kotlin.metadata.Func" + + "tion\030\252\001 \003(\0132).org.jetbrains.kotlin.metad", + "ata.Annotation:s\n\016inline_ir_body\022\'.org.j" + + "etbrains.kotlin.metadata.Function\030\253\001 \001(\013" + + "21.org.jetbrains.kotlin.metadata.konan.I" + + "nlineIrBody:p\n\023property_annotation\022\'.org" + + ".jetbrains.kotlin.metadata.Property\030\252\001 \003" + + "(\0132).org.jetbrains.kotlin.metadata.Annot" + + "ation:C\n\021has_backing_field\022\'.org.jetbrai" + + "ns.kotlin.metadata.Property\030\253\001 \001(\010:B\n\020us" + + "ed_as_variable\022\'.org.jetbrains.kotlin.me" + + "tadata.Property\030\254\001 \001(\010:~\n\022compile_time_v", + "alue\022\'.org.jetbrains.kotlin.metadata.Pro" + + "perty\030\255\001 \001(\01328.org.jetbrains.kotlin.meta" + + "data.Annotation.Argument.Value:z\n\025inline" + + "_getter_ir_body\022\'.org.jetbrains.kotlin.m" + + "etadata.Property\030\256\001 \001(\01321.org.jetbrains." + + "kotlin.metadata.konan.InlineIrBody:z\n\025in" + + "line_setter_ir_body\022\'.org.jetbrains.kotl" + + "in.metadata.Property\030\257\001 \001(\01321.org.jetbra" + + "ins.kotlin.metadata.konan.InlineIrBody:s" + + "\n\025enum_entry_annotation\022(.org.jetbrains.", + "kotlin.metadata.EnumEntry\030\252\001 \003(\0132).org.j" + + "etbrains.kotlin.metadata.Annotation:E\n\022e" + + "num_entry_ordinal\022(.org.jetbrains.kotlin" + + ".metadata.EnumEntry\030\253\001 \001(\005:w\n\024parameter_" + + "annotation\022-.org.jetbrains.kotlin.metada" + + "ta.ValueParameter\030\252\001 \003(\0132).org.jetbrains" + + ".kotlin.metadata.Annotation:h\n\017type_anno" + + "tation\022#.org.jetbrains.kotlin.metadata.T" + + "ype\030\252\001 \003(\0132).org.jetbrains.kotlin.metada" + + "ta.Annotation:7\n\ttype_text\022#.org.jetbrai", + "ns.kotlin.metadata.Type\030\254\001 \001(\t:{\n\031type_p" + + "arameter_annotation\022,.org.jetbrains.kotl" + + "in.metadata.TypeParameter\030\252\001 \003(\0132).org.j" + + "etbrains.kotlin.metadata.AnnotationB\024B\022D" + + "ebugKonanProtoBuf" }; org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt index dd09844b4f4..1c9581cd5aa 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt @@ -54,7 +54,7 @@ val PROTO_PATHS: List = listOf( ProtoPath("core/metadata/src/builtins.proto"), ProtoPath("js/js.serializer/src/js.proto"), ProtoPath("js/js.serializer/src/js-ast.proto"), - ProtoPath("konan/serializer/src/konan.proto"), + ProtoPath("konan/library-reader/src/konan.proto"), ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"), ProtoPath("core/metadata.jvm/src/jvm_module.proto"), ProtoPath("build-common/src/java_descriptors.proto") diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index 26b54f1bc6d..d4ad5af2536 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(project(":kotlin-native:kotlin-native-serializer")) + compile(project(":kotlin-native:kotlin-native-library-reader")) compileOnly(project(":idea:idea-gradle")) compileOnly(project(":idea:idea-native")) diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index 287a5b3c418..880570a9cdd 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { compile(project(":idea:idea-jvm")) compile(project(":compiler:frontend")) compileOnly(intellijDep()) - compile(project(":kotlin-native:kotlin-native-serializer")) + compile(project(":kotlin-native:kotlin-native-library-reader")) } sourceSets { diff --git a/konan/serializer/build.gradle.kts b/konan/library-reader/build.gradle.kts similarity index 100% rename from konan/serializer/build.gradle.kts rename to konan/library-reader/build.gradle.kts diff --git a/konan/serializer/src/konan.proto b/konan/library-reader/src/konan.proto similarity index 100% rename from konan/serializer/src/konan.proto rename to konan/library-reader/src/konan.proto diff --git a/konan/serializer/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt b/konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt rename to konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/cli/common/arguments/konan/K2NativeCompilerArguments.kt b/konan/library-reader/src/org/jetbrains/kotlin/cli/common/arguments/konan/K2NativeCompilerArguments.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/cli/common/arguments/konan/K2NativeCompilerArguments.kt rename to konan/library-reader/src/org/jetbrains/kotlin/cli/common/arguments/konan/K2NativeCompilerArguments.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorFactory.kt b/konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorFactory.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorFactory.kt rename to konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorFactory.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorUtils.kt b/konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorUtils.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorUtils.kt rename to konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorUtils.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleOrigin.kt b/konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleOrigin.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleOrigin.kt rename to konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleOrigin.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/impl/KonanModuleDescriptorFactoryImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/impl/KonanModuleDescriptorFactoryImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/descriptors/konan/impl/KonanModuleDescriptorFactoryImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/impl/KonanModuleDescriptorFactoryImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/file/File.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/file/File.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/file/File.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/file/File.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryUtils.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryUtils.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryUtils.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryUtils.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanMetadataReader.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanMetadataReader.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanMetadataReader.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanMetadataReader.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/impl/DefaultMetadataReaderImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/DefaultMetadataReaderImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/impl/DefaultMetadataReaderImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/DefaultMetadataReaderImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/KonanLibraryResolver.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/KonanLibraryResolver.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/KonanLibraryResolver.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/KonanLibraryResolver.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/KonanResolvedLibrary.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/KonanResolvedLibrary.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/KonanResolvedLibrary.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/KonanResolvedLibrary.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanLibraryResolverImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanLibraryResolverImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanLibraryResolverImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanLibraryResolverImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanResolvedLibraryImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanResolvedLibraryImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanResolvedLibraryImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanResolvedLibraryImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/properties/Properties.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/properties/Properties.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/properties/Properties.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/properties/Properties.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/util/Substitution.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/util/Substitution.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/konan/util/Substitution.kt rename to konan/library-reader/src/org/jetbrains/kotlin/konan/util/Substitution.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java b/konan/library-reader/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java similarity index 99% rename from konan/serializer/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java rename to konan/library-reader/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java index dc68c54a44c..5d46d20849c 100644 --- a/konan/serializer/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java +++ b/konan/library-reader/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: konan/serializer/src/konan.proto +// source: konan/library-reader/src/konan.proto package org.jetbrains.kotlin.metadata.konan; diff --git a/konan/serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatform.kt b/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatform.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatform.kt rename to konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatform.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt b/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt rename to konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanClassDataFinder.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanClassDataFinder.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanClassDataFinder.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanClassDataFinder.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializationUtils.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializationUtils.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializationUtils.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializationUtils.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedModuleDescriptorFactory.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedModuleDescriptorFactory.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedModuleDescriptorFactory.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedModuleDescriptorFactory.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedPackageFragmentsFactory.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedPackageFragmentsFactory.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedPackageFragmentsFactory.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedPackageFragmentsFactory.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanMetadataVersion.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanMetadataVersion.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanMetadataVersion.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanMetadataVersion.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanPackageFragment.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanPackageFragment.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanPackageFragment.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanPackageFragment.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanResolvedModuleDescriptorsFactory.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanResolvedModuleDescriptorsFactory.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanResolvedModuleDescriptorsFactory.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanResolvedModuleDescriptorsFactory.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/NullFlexibleTypeDeserializer.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/NullFlexibleTypeDeserializer.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/NullFlexibleTypeDeserializer.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/NullFlexibleTypeDeserializer.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedModuleDescriptorFactoryImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedModuleDescriptorFactoryImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedModuleDescriptorFactoryImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedModuleDescriptorFactoryImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedPackageFragmentsFactoryImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedPackageFragmentsFactoryImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedPackageFragmentsFactoryImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedPackageFragmentsFactoryImpl.kt diff --git a/konan/serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanResolvedModuleDescriptorsFactoryImpl.kt b/konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanResolvedModuleDescriptorsFactoryImpl.kt similarity index 100% rename from konan/serializer/src/org/jetbrains/kotlin/serialization/konan/impl/KonanResolvedModuleDescriptorsFactoryImpl.kt rename to konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanResolvedModuleDescriptorsFactoryImpl.kt diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 2356fc811c2..f40fb596519 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -45,8 +45,8 @@ val projectsToShadow by extra(listOf( ":js:js.frontend", ":js:js.parser", ":js:js.serializer", - ":kotlin-native:kotlin-native-serializer", ":kotlin-native:kotlin-native-utils", + ":kotlin-native:kotlin-native-library-reader", ":compiler:light-classes", ":compiler:plugin-api", ":kotlin-preloader", diff --git a/settings.gradle b/settings.gradle index f5612642517..61cfad23eb0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -50,7 +50,7 @@ include ":kotlin-build-common", ":js:js.dce", ":js:js.tests", ":kotlin-native:kotlin-native-utils", - ":kotlin-native:kotlin-native-serializer", + ":kotlin-native:kotlin-native-library-reader", ":jps-plugin", ":kotlin-jps-plugin", ":core:descriptors", @@ -241,7 +241,7 @@ project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as project(':compiler:ir.backend.common').projectDir = "$rootDir/compiler/ir/backend.common" as File project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" as File project(':kotlin-native:kotlin-native-utils').projectDir = "$rootDir/konan/utils" as File -project(':kotlin-native:kotlin-native-serializer').projectDir = "$rootDir/konan/serializer" as File +project(':kotlin-native:kotlin-native-library-reader').projectDir = "$rootDir/konan/library-reader" as File project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/android-extensions/android-extensions-compiler" as File