Refactoring: extract "kotlin.stdlib" to constant

It will be used in IDE as well.
This commit is contained in:
Nikolay Krasko
2017-09-29 18:22:53 +03:00
parent 3145c096a7
commit dc86f8c432
2 changed files with 5 additions and 2 deletions
@@ -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
)
}
@@ -106,3 +106,5 @@ interface JavaModule {
override fun toString(): String = name
}
}
const val KOTLIN_STDLIB_MODULE_NAME = "kotlin.stdlib"