From 3bdc7f651442359e817be01e725cd2ea55a2fb34 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Wed, 19 Apr 2017 12:09:06 +0300 Subject: [PATCH] kotlin-compiler:1.1-20170418.161005-471 --- .../src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt index b6aff151f54..318ee4a3a8e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt @@ -39,8 +39,8 @@ class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageMana object KonanPlatform : TargetPlatform("Konan") { override val multiTargetPlatform = MultiTargetPlatform.Specific(platformName) - override fun getDefaultImports(languageVersionSettings: LanguageVersionSettings): List { - return Default.getDefaultImports(languageVersionSettings) + listOf( + override fun getDefaultImports(includeKotlinComparisons: Boolean): List { + return Default.getDefaultImports(includeKotlinComparisons) + listOf( ImportPath.fromString("konan.*") ) } diff --git a/gradle.properties b/gradle.properties index b484a171a5f..741512f80a5 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-20170417.154352-466 +kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170418.161005-471 konanVersion=0.1