azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use MessageCollector.NONE as a dummy logger collector for js library resolver

Browse Source
This commit is contained in:
Alexander Gorshenev
2019-10-07 17:19:36 +03:00
committed by alexander-gorshenev
parent 71eb413350
commit c2c88a9ee6
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.js/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":compiler:frontend"))
testCompile(project(":compiler:cli"))
testCompile(project(":compiler:cli-js"))
testCompile(project(":compiler:util"))
testRuntime(project(":kotlin-reflect"))
compiler/ir/serialization.js/test/GenerateIrRuntime.kt
+3 -8
View File
@@ -9,6 +9,8 @@ import com.intellij.openapi.Disposable
import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.js.messageCollectorLogger
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.*
@@ -17,7 +19,6 @@ import org.jetbrains.kotlin.library.resolver.KotlinLibraryResolveResult
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource
import org.jetbrains.kotlin.serialization.js.ModuleKind
import org.jetbrains.kotlin.util.Logger
import java.io.File
fun buildConfiguration(environment: KotlinCoreEnvironment, moduleName: String): CompilerConfiguration {
@@ -115,13 +116,7 @@ fun main(args: Array<String>) {
}
val resolvedLibraries = jsResolveLibraries(
dependencies,
object : Logger {
override fun log(message: String) = println(message)
override fun error(message: String) = kotlin.error(message)
override fun warning(message: String) = println(message)
override fun fatal(message: String) = kotlin.error(message)
}
dependencies, messageCollectorLogger(MessageCollector.NONE)
)
buildKLib(File(outputPath).absolutePath, listOfKtFilesFrom(inputFiles), outputPath, resolvedLibraries, listOfKtFilesFrom(commonSources))