K/N: Rename "kotlin-native-serializer" to "kotlin-native-library-reader"

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() {

generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt

@@ -54,7 +54,7 @@ val PROTO_PATHS: List<ProtoPath> = 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")

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"))

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 {

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;
 

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",

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