diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 162dc6d816e..d03e84d42c0 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.addKotlinSourceRoot +import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter import org.jetbrains.kotlin.util.PerformanceCounter @@ -134,7 +135,7 @@ public open class K2JVMCompiler : CLICompiler() { else emptyList()) - configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: "main") + configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: JvmAbi.DEFAULT_MODULE_NAME) putAdvancedOptions(configuration, arguments) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java index 19b6f6760ba..8349c27a59a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java @@ -45,6 +45,7 @@ public final class JvmAbi { public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass"; public static final String KOTLIN_PACKAGE_FIELD_NAME = "$kotlinPackage"; public static final String MODULE_NAME_FIELD = "$moduleName"; + public static final String DEFAULT_MODULE_NAME = "main"; public static final ClassId REFLECTION_FACTORY_IMPL = ClassId.topLevel(new FqName("kotlin.reflect.jvm.internal.ReflectionFactoryImpl")); @NotNull diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java index d664ac70e38..9284194e76d 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java @@ -19,6 +19,7 @@ package kotlin.reflect.jvm.internal; import kotlin.jvm.KotlinReflectionNotSupportedError; import kotlin.jvm.internal.*; import kotlin.reflect.*; +import org.jetbrains.kotlin.load.java.JvmAbi; /** * @suppress @@ -32,7 +33,7 @@ public class ReflectionFactoryImpl extends ReflectionFactory { @Override public KPackage createKotlinPackage(Class javaClass) { - return createKotlinPackage(javaClass, "main"); + return createKotlinPackage(javaClass, JvmAbi.DEFAULT_MODULE_NAME); } @Override