Move core protobuf schemas to 'metadata' and 'metadata.jvm'

core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt

@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
 
 /**
  * The version of the metadata serialized by the compiler and deserialized by the compiler and reflection.
- * This version includes the version of the core protobuf messages (descriptors.proto) as well as JVM extensions (jvm_descriptors.proto).
+ * This version includes the version of the core protobuf messages (metadata.proto) as well as JVM extensions (jvm_metadata.proto).
  */
 class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
     // NOTE: 1.1 is incompatible with 1.0 and hence with any other version except 1.1.*

core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsBinaryVersion.kt

@@ -22,7 +22,7 @@ import java.io.InputStream
 
 /**
  * The version of the format in which the .kotlin_builtins file is stored. This version also includes the version
- * of the core protobuf messages (descriptors.proto).
+ * of the core protobuf messages (metadata.proto).
  */
 class BuiltInsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
     override fun isCompatible() = this.isCompatibleTo(INSTANCE)

core/metadata.jvm/src/jvm_metadata.proto

@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-import "core/deserialization/src/ext_options.proto";
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/ext_options.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "JvmProtoBuf";
 option optimize_for = LITE_RUNTIME;

core/metadata.jvm/src/jvm_module.proto

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "JvmModuleProtoBuf";
 option optimize_for = LITE_RUNTIME;

core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java

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

core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java

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

core/metadata/src/builtins.proto

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.builtins;
 
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "BuiltInsProtoBuf";
 option optimize_for = LITE_RUNTIME;

core/metadata/src/metadata.proto

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization;
 
-import "core/deserialization/src/ext_options.proto";
+import "core/metadata/src/ext_options.proto";
 
 option java_outer_classname = "ProtoBuf";
 option optimize_for = LITE_RUNTIME;

core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java

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

core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java

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