From 92964e1eae961f321cb3ff2f8d52ba348b1516ec Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 24 Apr 2017 22:34:52 +0300 Subject: [PATCH] kotlin-compiler:1.1-20170424.172927-491 --- .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index 601dfbf6278..a3c57336962 100644 --- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.backend.konan.* import org.jetbrains.kotlin.backend.konan.util.profile import org.jetbrains.kotlin.cli.common.CLICompiler 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.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration @@ -57,7 +58,7 @@ class K2Native : CLICompiler() { ): ExitCode { val environment = KotlinCoreEnvironment.createForProduction(rootDisposable, - configuration, Arrays.asList("extensions/common.xml")) + configuration, EnvironmentConfigFiles.NATIVE_CONFIG_FILES) val project = environment.project val konanConfig = KonanConfig(project, configuration) diff --git a/gradle.properties b/gradle.properties index 741512f80a5..fabf97b46ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ remoteRoot=konan_tests #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345 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