From a3d8fdf30ad1df40541c85d26b7a9d5c0fb95857 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 27 May 2019 13:19:53 +0200
Subject: [PATCH] Fix compilation of kotlin-maven-plugin

Also remove the remaining usage (in a comment) of
JvmAbi.DEFAULT_MODULE_NAME
---
 .../test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java     | 2 +-
 .../org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java   | 2 +-
 core/metadata.jvm/src/jvm_metadata.proto                      | 2 +-
 .../src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java    | 2 +-
 .../org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java
index f36004b80b2..390053af263 100644
--- a/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java
@@ -34443,7 +34443,7 @@ public final class DebugProtoBuf {
       "tbrains.kotlin.metadata.VersionRequireme" +
       "nt.Level:\005ERROR\022\022\n\nerror_code\030\004 \001(\005\022\025\n\007m" +
       "essage\030\005 \001(\005B\004\230\265\030\001\022e\n\014version_kind\030\006 \001(\016" +
-      "2=.org.jetbrains.kotlin.metadata.version" +
+      "2=.org.jetbrains.kotlin.metadata.Version" +
       "Requirement.VersionKind:\020LANGUAGE_VERSIO" +
       "N\"+\n\005Level\022\013\n\007WARNING\020\000\022\t\n\005ERROR\020\001\022\n\n\006HI" +
       "DDEN\020\002\"J\n\013VersionKind\022\024\n\020LANGUAGE_VERSIO" +
diff --git a/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
index 52d3cc9950d..ea3c339ad86 100644
--- a/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
@@ -4613,7 +4613,7 @@ public final class DebugJvmProtoBuf {
    * <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
    *
    * <pre>
-   * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
+   * If absent, assumed to be "main" (JvmProtoBufUtil.DEFAULT_MODULE_NAME)
    * </pre>
    */
   public static final
diff --git a/core/metadata.jvm/src/jvm_metadata.proto b/core/metadata.jvm/src/jvm_metadata.proto
index cafe595d34f..84d18938f34 100644
--- a/core/metadata.jvm/src/jvm_metadata.proto
+++ b/core/metadata.jvm/src/jvm_metadata.proto
@@ -119,7 +119,7 @@ extend TypeParameter {
 }
 
 extend Class {
-  // If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
+  // If absent, assumed to be "main" (JvmProtoBufUtil.DEFAULT_MODULE_NAME)
   optional int32 class_module_name = 101 [(string_id_in_table) = true];
 
   repeated Property class_local_variable = 102;
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java
index 9ac8bd13f8f..b66aa41938c 100644
--- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java
+++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java
@@ -3933,7 +3933,7 @@ public final class JvmProtoBuf {
    * <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
    *
    * <pre>
-   * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
+   * If absent, assumed to be "main" (JvmProtoBufUtil.DEFAULT_MODULE_NAME)
    * </pre>
    */
   public static final
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
index 1c8385effe7..bf65d872fa0 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
@@ -45,7 +45,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
-import org.jetbrains.kotlin.load.java.JvmAbi;
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtScript;
 import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar;
@@ -185,7 +185,7 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
             }
 
             configuration.add(CLIConfigurationKeys.CONTENT_ROOTS, new KotlinSourceRoot(scriptFile.getAbsolutePath(), false));
-            configuration.put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME);
+            configuration.put(CommonConfigurationKeys.MODULE_NAME, JvmProtoBufUtil.DEFAULT_MODULE_NAME);
 
             ConfigurationKt.configureScriptDefinitions(
                     scriptTemplates, configuration, this.getClass().getClassLoader(), messageCollector, new HashMap<>()