azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge serialization.js module into js.serializer

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-03-19 13:05:24 +03:00
parent e550dba033
commit 842eaa86a4
13 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/compiler-tests.iml
+1 -1
View File
@@ -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
+7 -7
View File
@@ -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" +
"to\022%org.jetbrains.kotlin.serialization.j" +
"s\"~\n\007Library\022G\n\005entry\030\001 \003(\01328.org.jetbra" +
"ins.kotlin.serialization.js.Library.File" +
"Entry\032*\n\tFileEntry\022\014\n\004path\030\001 \002(\t\022\017\n\007cont" +
"ent\030\002 \002(\014B\021B\017DebugJsProtoBuf"
"\n#js/js.serializer/src/js.debug.proto\022%o" +
"rg.jetbrains.kotlin.serialization.js\"~\n\007" +
"Library\022G\n\005entry\030\001 \003(\01328.org.jetbrains.k" +
"otlin.serialization.js.Library.FileEntry" +
"\032*\n\tFileEntry\022\014\n\004path\030\001 \002(\t\022\017\n\007content\030\002" +
" \002(\014B\021B\017DebugJsProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {