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

kotlin-compiler:1.1-20170424.172927-491

Browse Source
This commit is contained in:
Vasily Levchenko
2017-04-24 22:34:52 +03:00
committed by vvlevchenko
parent 13dbbd361b
commit 92964e1eae
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+2 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.backend.konan.*
import org.jetbrains.kotlin.backend.konan.util.profile import org.jetbrains.kotlin.backend.konan.util.profile
import org.jetbrains.kotlin.cli.common.CLICompiler import org.jetbrains.kotlin.cli.common.CLICompiler
import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -57,7 +58,7 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
): ExitCode { ): ExitCode {
val environment = KotlinCoreEnvironment.createForProduction(rootDisposable, val environment = KotlinCoreEnvironment.createForProduction(rootDisposable,
configuration, Arrays.asList<String>("extensions/common.xml")) configuration, EnvironmentConfigFiles.NATIVE_CONFIG_FILES)
val project = environment.project val project = environment.project
val konanConfig = KonanConfig(project, configuration) val konanConfig = KonanConfig(project, configuration)
gradle.properties
+1 -1
View File
@@ -21,5 +21,5 @@ remoteRoot=konan_tests
#kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT
# Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345 # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345
testDataVersion=1009012:id testDataVersion=1009012:id
kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170418.161005-471 kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170424.172927-491
konanVersion=0.1 konanVersion=0.1