From a28c435d95cca59ccb26dfb5c28cde59c0c65e59 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 30 Jul 2018 11:50:01 +0300 Subject: [PATCH] [kotlin compiler][update] 1.2.70-dev-764 --- .../src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt | 3 ++- gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt index b37ef12a969..f3e2ab7f978 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt @@ -69,7 +69,8 @@ fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEnvironme phaser.phase(KonanPhase.PSI_TO_IR) { // Translate AST to high level IR. - val translator = Psi2IrTranslator(Psi2IrConfiguration(false)) + val translator = Psi2IrTranslator(context.config.configuration.languageVersionSettings, + Psi2IrConfiguration(false)) val generatorContext = translator.createGeneratorContext(context.moduleDescriptor, bindingContext) @Suppress("DEPRECATION") context.psi2IrGeneratorContext = generatorContext diff --git a/gradle.properties b/gradle.properties index 25ead93d3ec..0281dfeba6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,8 +20,8 @@ remoteRoot=konan_tests #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler testDataVersion=1226829:id -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.70-dev-616,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.2.70-dev-616 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.70-dev-764,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.2.70-dev-764 konanVersion=0.9 org.gradle.jvmargs='-Dfile.encoding=UTF-8'