merge serialization.js module into js.serializer

.idea/artifacts/KotlinPlugin.xml

@@ -26,7 +26,6 @@
           <element id="module-output" name="idea-jps-common" />
           <element id="module-output" name="preloader" />
           <element id="module-output" name="serialization" />
-          <element id="module-output" name="serialization.js" />
           <element id="module-output" name="serialization.jvm" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
@@ -40,6 +39,7 @@
           <element id="module-output" name="ide-common" />
           <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
           <element id="module-output" name="kotlin-android-plugin" />
+          <element id="module-output" name="js.serializer" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">

.idea/modules.xml

@@ -49,7 +49,6 @@
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/serialization.js/serialization.js.iml" filepath="$PROJECT_DIR$/core/serialization.js/serialization.js.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" filepath="$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />

build.xml

@@ -93,7 +93,6 @@
         <include name="core/descriptors/src"/>
         <include name="core/serialization/src"/>
         <include name="core/descriptor.loader.java/src"/>
-        <include name="core/serialization.js/src"/>
         <include name="core/serialization.jvm/src"/>
         <include name="core/util.runtime/src"/>
         <include name="compiler/frontend/src"/>
@@ -121,7 +120,6 @@
         <include name="serialization/**"/>
         <include name="descriptor.loader.java/**"/>
         <include name="frontend.java/**"/>
-        <include name="serialization.js/**"/>
         <include name="serialization.jvm/**"/>
         <include name="backend/**"/>
         <include name="backend-common/**"/>
@@ -188,7 +186,6 @@
             <fileset dir="core/descriptors/src"/>
             <fileset dir="core/descriptor.loader.java/src"/>
             <fileset dir="core/serialization/src"/>
-            <fileset dir="core/serialization.js/src"/>
             <fileset dir="core/serialization.jvm/src"/>
             <fileset dir="core/util.runtime/src"/>
             <fileset dir="compiler/frontend/src"/>

compiler/tests/compiler-tests.iml

@@ -15,11 +15,11 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="descriptors.runtime" />
     <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.tests" />
     <orderEntry type="module" module-name="preloader" />
     <orderEntry type="module" module-name="util" />

compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.js/src/js.debug.proto
+// source: js/js.serializer/src/js.debug.proto
 
 package org.jetbrains.kotlin.serialization.js;
 
@@ -1292,12 +1292,12 @@ public final class DebugJsProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n(core/serialization.js/src/js.debug.pro" +
+      "\n#js/js.serializer/src/js.debug.proto\022%o" +
-      "to\022%org.jetbrains.kotlin.serialization.j" +
+      "rg.jetbrains.kotlin.serialization.js\"~\n\007" +
-      "s\"~\n\007Library\022G\n\005entry\030\001 \003(\01328.org.jetbra" +
+      "Library\022G\n\005entry\030\001 \003(\01328.org.jetbrains.k" +
-      "ins.kotlin.serialization.js.Library.File" +
+      "otlin.serialization.js.Library.FileEntry" +
-      "Entry\032*\n\tFileEntry\022\014\n\004path\030\001 \002(\t\022\017\n\007cont" +
+      "\032*\n\tFileEntry\022\014\n\004path\030\001 \002(\t\022\017\n\007content\030\002" +
-      "ent\030\002 \002(\014B\021B\017DebugJsProtoBuf"
+      " \002(\014B\021B\017DebugJsProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

core/serialization.js/serialization.js.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="util.runtime" />
-  </component>
-</module>

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

@@ -51,7 +51,7 @@ public data class ProtoPath(
 public val PROTO_PATHS: List<ProtoPath> = listOf(
         ProtoPath("core/serialization/src/descriptors.proto", "core/serialization/src"),
         ProtoPath("core/serialization/src/builtins.proto", "core/serialization/src"),
-        ProtoPath("core/serialization.js/src/js.proto", "core/serialization.js/src"),
+        ProtoPath("js/js.serializer/src/js.proto", "js/js.serializer/src"),
         ProtoPath("core/serialization.jvm/src/jvm_descriptors.proto", "core/serialization.jvm/src")
 )
 

idea/idea-analysis/idea-analysis.iml

@@ -15,7 +15,6 @@
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="library" name="intellij-core-analysis" level="project" />
@@ -30,6 +29,7 @@
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
     <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="library" name="trove4j" level="project" />
     <orderEntry type="module" module-name="ide-common" exported="" />
     <orderEntry type="module" module-name="util" />

js/js.frontend/js.frontend.iml

@@ -13,6 +13,6 @@
     <orderEntry type="module" module-name="js.parser" exported="" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
+    <orderEntry type="module" module-name="js.serializer" />
   </component>
 </module>

js/js.serializer/js.serializer.iml

@@ -9,7 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.js/src/js.proto
+// source: js/js.serializer/src/js.proto
 
 package org.jetbrains.kotlin.serialization.js;