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

Extract module 'deserialization' out of 'serialization'

Browse Source 
'deserialization' stays in core because it's needed both in compiler and
reflection, but 'serialization' is used only in the compiler
This commit is contained in:
Alexander Udalov
2015-03-27 04:24:32 +03:00
parent d09e0e73fa
commit 32c3bb8c7f
60 changed files with 203 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/generators.iml
+1 -2
View File
@@ -16,7 +16,7 @@
<orderEntry type="module" module-name="frontend.java" scope="TEST" />
<orderEntry type="module" module-name="injector-generator" scope="TEST" />
<orderEntry type="module" module-name="cli" scope="TEST" />
<orderEntry type="module" module-name="serialization" scope="TEST" />
<orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
<orderEntry type="module" module-name="descriptors.runtime" scope="TEST" />
<orderEntry type="module" module-name="js.tests" scope="TEST" />
<orderEntry type="module" module-name="jps-plugin" scope="TEST" />
@@ -28,6 +28,5 @@
<orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="descriptor.loader.java" />
</component>
</module>
generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+2 -2
View File
@@ -47,8 +47,8 @@ public class ProtoPath(public val file: String) {
}
public val PROTO_PATHS: List<ProtoPath> = listOf(
ProtoPath("core/serialization/src/descriptors.proto"),
ProtoPath("core/serialization/src/builtins.proto"),
ProtoPath("core/deserialization/src/descriptors.proto"),
ProtoPath("core/deserialization/src/builtins.proto"),
ProtoPath("js/js.serializer/src/js.proto"),
ProtoPath("core/descriptor.loader.java/src/jvm_descriptors.proto")
)