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

[K/N lib] merge metadata & serializer, publish the result to Maven

Browse Source
This commit is contained in:
Dmitriy Dolovov
2018-08-27 19:38:20 +03:00
committed by Mikhail Glukhikh
parent eda29a48a4
commit db29d12c60
8 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java
+65 -65
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: konan/metadata/src/konan.debug.proto // source: konan/serializer/src/konan.debug.proto
package org.jetbrains.kotlin.metadata.konan; package org.jetbrains.kotlin.metadata.konan;
@@ -4084,71 +4084,71 @@ public final class DebugKonanProtoBuf {
descriptor; descriptor;
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n$konan/metadata/src/konan.debug.proto\022#" + "\n&konan/serializer/src/konan.debug.proto" +
"org.jetbrains.kotlin.metadata.konan\032&cor" + "\022#org.jetbrains.kotlin.metadata.konan\032&c" +
"e/metadata/src/metadata.debug.proto\"\"\n\014I" + "ore/metadata/src/metadata.debug.proto\"\"\n" +
"nlineIrBody\022\022\n\nencoded_ir\030\013 \002(\t\"\305\002\n\027Link" + "\014InlineIrBody\022\022\n\nencoded_ir\030\013 \002(\t\"\305\002\n\027Li" +
"DataPackageFragment\022\017\n\007fq_name\030\001 \002(\t\0227\n\007" + "nkDataPackageFragment\022\017\n\007fq_name\030\001 \002(\t\0227" +
"package\030\004 \002(\0132&.org.jetbrains.kotlin.met" + "\n\007package\030\004 \002(\0132&.org.jetbrains.kotlin.m" +
"adata.Package\022E\n\007classes\030\005 \002(\01324.org.jet" + "etadata.Package\022E\n\007classes\030\005 \002(\01324.org.j" +
"brains.kotlin.metadata.konan.LinkDataCla" + "etbrains.kotlin.metadata.konan.LinkDataC" +
"sses\022\020\n\010is_empty\030\006 \002(\010\022E\n\nname_table\030\002 \002" + "lasses\022\020\n\010is_empty\030\006 \002(\010\022E\n\nname_table\030\002" +
"(\01321.org.jetbrains.kotlin.metadata.Quali", " \002(\01321.org.jetbrains.kotlin.metadata.Qua",
"fiedNameTable\022@\n\014string_table\030\003 \002(\0132*.or" + "lifiedNameTable\022@\n\014string_table\030\003 \002(\0132*." +
"g.jetbrains.kotlin.metadata.StringTable\"" + "org.jetbrains.kotlin.metadata.StringTabl" +
"\\\n\017LinkDataClasses\022\022\n\nclass_name\030\001 \003(\005\0225" + "e\"\\\n\017LinkDataClasses\022\022\n\nclass_name\030\001 \003(\005" +
"\n\007classes\030\002 \003(\0132$.org.jetbrains.kotlin.m" + "\0225\n\007classes\030\002 \003(\0132$.org.jetbrains.kotlin" +
"etadata.Class\"\\\n\017LinkDataLibrary\022\023\n\013modu" + ".metadata.Class\"\\\n\017LinkDataLibrary\022\023\n\013mo" +
"le_name\030\001 \002(\t\022\035\n\025package_fragment_name\030\002" + "dule_name\030\001 \002(\t\022\035\n\025package_fragment_name" +
" \003(\t\022\025\n\rempty_package\030\003 \003(\t:@\n\017package_f" + "\030\002 \003(\t\022\025\n\rempty_package\030\003 \003(\t:@\n\017package" +
"q_name\022&.org.jetbrains.kotlin.metadata.P" + "_fq_name\022&.org.jetbrains.kotlin.metadata" +
"ackage\030\253\001 \001(\005:j\n\020class_annotation\022$.org." + ".Package\030\253\001 \001(\005:j\n\020class_annotation\022$.or" +
"jetbrains.kotlin.metadata.Class\030\252\001 \003(\0132)", "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" + ".org.jetbrains.kotlin.metadata.Annotatio" +
"n:v\n\026constructor_annotation\022*.org.jetbra" + "n:C\n\021has_backing_field\022\'.org.jetbrains.k" +
"ins.kotlin.metadata.Constructor\030\252\001 \003(\0132)" + "otlin.metadata.Property\030\253\001 \001(\010:B\n\020used_a" +
".org.jetbrains.kotlin.metadata.Annotatio" + "s_variable\022\'.org.jetbrains.kotlin.metada" +
"n:\202\001\n\032inline_constructor_ir_body\022*.org.j" + "ta.Property\030\254\001 \001(\010:~\n\022compile_time_value",
"etbrains.kotlin.metadata.Constructor\030\253\001 " + "\022\'.org.jetbrains.kotlin.metadata.Propert" +
"\001(\01321.org.jetbrains.kotlin.metadata.kona" + "y\030\255\001 \001(\01328.org.jetbrains.kotlin.metadata" +
"n.InlineIrBody:p\n\023function_annotation\022\'." + ".Annotation.Argument.Value:z\n\025inline_get" +
"org.jetbrains.kotlin.metadata.Function\030\252" + "ter_ir_body\022\'.org.jetbrains.kotlin.metad" +
"\001 \003(\0132).org.jetbrains.kotlin.metadata.An", "ata.Property\030\256\001 \001(\01321.org.jetbrains.kotl" +
"notation:s\n\016inline_ir_body\022\'.org.jetbrai" + "in.metadata.konan.InlineIrBody:z\n\025inline" +
"ns.kotlin.metadata.Function\030\253\001 \001(\01321.org" + "_setter_ir_body\022\'.org.jetbrains.kotlin.m" +
".jetbrains.kotlin.metadata.konan.InlineI" + "etadata.Property\030\257\001 \001(\01321.org.jetbrains." +
"rBody:p\n\023property_annotation\022\'.org.jetbr" + "kotlin.metadata.konan.InlineIrBody:s\n\025en" +
"ains.kotlin.metadata.Property\030\252\001 \003(\0132).o" + "um_entry_annotation\022(.org.jetbrains.kotl",
"rg.jetbrains.kotlin.metadata.Annotation:" + "in.metadata.EnumEntry\030\252\001 \003(\0132).org.jetbr" +
"C\n\021has_backing_field\022\'.org.jetbrains.kot" + "ains.kotlin.metadata.Annotation:E\n\022enum_" +
"lin.metadata.Property\030\253\001 \001(\010:B\n\020used_as_" + "entry_ordinal\022(.org.jetbrains.kotlin.met" +
"variable\022\'.org.jetbrains.kotlin.metadata" + "adata.EnumEntry\030\253\001 \001(\005:w\n\024parameter_anno" +
".Property\030\254\001 \001(\010:~\n\022compile_time_value\022\'", "tation\022-.org.jetbrains.kotlin.metadata.V" +
".org.jetbrains.kotlin.metadata.Property\030" + "alueParameter\030\252\001 \003(\0132).org.jetbrains.kot" +
"\255\001 \001(\01328.org.jetbrains.kotlin.metadata.A" + "lin.metadata.Annotation:h\n\017type_annotati" +
"nnotation.Argument.Value:z\n\025inline_gette" + "on\022#.org.jetbrains.kotlin.metadata.Type\030" +
"r_ir_body\022\'.org.jetbrains.kotlin.metadat" + "\252\001 \003(\0132).org.jetbrains.kotlin.metadata.A" +
"a.Property\030\256\001 \001(\01321.org.jetbrains.kotlin" + "nnotation:7\n\ttype_text\022#.org.jetbrains.k",
".metadata.konan.InlineIrBody:z\n\025inline_s" + "otlin.metadata.Type\030\254\001 \001(\t:{\n\031type_param" +
"etter_ir_body\022\'.org.jetbrains.kotlin.met" + "eter_annotation\022,.org.jetbrains.kotlin.m" +
"adata.Property\030\257\001 \001(\01321.org.jetbrains.ko" + "etadata.TypeParameter\030\252\001 \003(\0132).org.jetbr" +
"tlin.metadata.konan.InlineIrBody:s\n\025enum" + "ains.kotlin.metadata.AnnotationB\024B\022Debug" +
"_entry_annotation\022(.org.jetbrains.kotlin", "KonanProtoBuf"
".metadata.EnumEntry\030\252\001 \003(\0132).org.jetbrai" +
"ns.kotlin.metadata.Annotation:E\n\022enum_en" +
"try_ordinal\022(.org.jetbrains.kotlin.metad" +
"ata.EnumEntry\030\253\001 \001(\005:w\n\024parameter_annota" +
"tion\022-.org.jetbrains.kotlin.metadata.Val" +
"ueParameter\030\252\001 \003(\0132).org.jetbrains.kotli" +
"n.metadata.Annotation:h\n\017type_annotation" +
"\022#.org.jetbrains.kotlin.metadata.Type\030\252\001" +
" \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
"otation:7\n\ttype_text\022#.org.jetbrains.kot",
"lin.metadata.Type\030\254\001 \001(\t:{\n\031type_paramet" +
"er_annotation\022,.org.jetbrains.kotlin.met" +
"adata.TypeParameter\030\252\001 \003(\0132).org.jetbrai" +
"ns.kotlin.metadata.AnnotationB\024B\022DebugKo" +
"nanProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+1 -1
View File
@@ -54,7 +54,7 @@ val PROTO_PATHS: List<ProtoPath> = listOf(
ProtoPath("core/metadata/src/builtins.proto"), ProtoPath("core/metadata/src/builtins.proto"),
ProtoPath("js/js.serializer/src/js.proto"), ProtoPath("js/js.serializer/src/js.proto"),
ProtoPath("js/js.serializer/src/js-ast.proto"), ProtoPath("js/js.serializer/src/js-ast.proto"),
ProtoPath("konan/metadata/src/konan.proto"), ProtoPath("konan/serializer/src/konan.proto"),
ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"), ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"),
ProtoPath("core/metadata.jvm/src/jvm_module.proto"), ProtoPath("core/metadata.jvm/src/jvm_module.proto"),
ProtoPath("build-common/src/java_descriptors.proto") ProtoPath("build-common/src/java_descriptors.proto")
konan/metadata/build.gradle.kts
-17
View File
@@ -1,17 +0,0 @@
plugins {
kotlin("jvm")
id("jps-compatible")
}
description = "Kotlin/Native metadata"
jvmTarget = "1.6"
dependencies {
compile(project(":core:metadata"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
konan/serializer/build.gradle.kts
+12 -3
View File
@@ -8,9 +8,14 @@ description = "Kotlin/Native deserializer and library reader"
jvmTarget = "1.6" jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java")) // Compile-only dependencies are needed for compilation of this module:
compile(project(":konan:konan-metadata")) compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
// Runtime dependency is necessary only to keep the right dependency record inside of POM file:
runtime(projectRuntimeJar(":kotlin-compiler"))
compile(project(":konan:konan-utils")) compile(project(":konan:konan-utils"))
} }
@@ -18,3 +23,7 @@ sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" {} "test" {}
} }
standardPublicJars()
publish()
konan/metadata/src/konan.proto → konan/serializer/src/konan.proto
View File
konan/metadata/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java → konan/serializer/src/org/jetbrains/kotlin/metadata/konan/KonanProtoBuf.java
+1 -1
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: konan/metadata/src/konan.proto // source: konan/serializer/src/konan.proto
package org.jetbrains.kotlin.metadata.konan; package org.jetbrains.kotlin.metadata.konan;
prepare/idea-plugin/build.gradle.kts
-1
View File
@@ -46,7 +46,6 @@ val projectsToShadow by extra(listOf(
":js:js.parser", ":js:js.parser",
":js:js.serializer", ":js:js.serializer",
":konan:konan-serializer", ":konan:konan-serializer",
":konan:konan-metadata",
":konan:konan-utils", ":konan:konan-utils",
":compiler:light-classes", ":compiler:light-classes",
":compiler:plugin-api", ":compiler:plugin-api",
settings.gradle
-2
View File
@@ -50,7 +50,6 @@ include ":kotlin-build-common",
":js:js.dce", ":js:js.dce",
":js:js.tests", ":js:js.tests",
":konan:konan-utils", ":konan:konan-utils",
":konan:konan-metadata",
":konan:konan-serializer", ":konan:konan-serializer",
":jps-plugin", ":jps-plugin",
":kotlin-jps-plugin", ":kotlin-jps-plugin",
@@ -242,7 +241,6 @@ 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:ir.backend.common').projectDir = "$rootDir/compiler/ir/backend.common" as File
project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" as File project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" as File
project(':konan:konan-utils').projectDir = "$rootDir/konan/utils" as File project(':konan:konan-utils').projectDir = "$rootDir/konan/utils" as File
project(':konan:konan-metadata').projectDir = "$rootDir/konan/metadata" as File
project(':konan:konan-serializer').projectDir = "$rootDir/konan/serializer" as File project(':konan:konan-serializer').projectDir = "$rootDir/konan/serializer" as File
project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" 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(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File