From dc86f8c432b65d2de010f74a272bcaaa480ccc0d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 29 Sep 2017 18:22:53 +0300 Subject: [PATCH] Refactoring: extract "kotlin.stdlib" to constant It will be used in IDE as well. --- .../kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt | 5 +++-- .../org/jetbrains/kotlin/resolve/jvm/modules/JavaModule.kt | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt index 07236ab2bab..95c66a1b292 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.isValidJavaFqName import org.jetbrains.kotlin.resolve.jvm.modules.JavaModule import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleInfo +import org.jetbrains.kotlin.resolve.jvm.modules.KOTLIN_STDLIB_MODULE_NAME import java.io.IOException import java.util.jar.Attributes import java.util.jar.Manifest @@ -264,11 +265,11 @@ class ClasspathRootsResolver( } } - if (requireStdlibModule && sourceModule != null && "kotlin.stdlib" !in allDependencies) { + if (requireStdlibModule && sourceModule != null && KOTLIN_STDLIB_MODULE_NAME !in allDependencies) { report( ERROR, "The Kotlin standard library is not found in the module graph. " + - "Please ensure you have the 'requires kotlin.stdlib' clause in your module definition", + "Please ensure you have the 'requires $KOTLIN_STDLIB_MODULE_NAME' clause in your module definition", sourceModule.moduleInfoFile ) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModule.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModule.kt index bfe8bbbb9bb..50b6a23efa8 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModule.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModule.kt @@ -106,3 +106,5 @@ interface JavaModule { override fun toString(): String = name } } + +const val KOTLIN_STDLIB_MODULE_NAME = "kotlin.stdlib" \ No newline at end of file