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 6b86820abaf..8aab7562070 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 @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.backend.konan import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.backend.konan.KonanPlatformConfigurator import org.jetbrains.kotlin.builtins.PrimitiveType +import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.MultiTargetPlatform import org.jetbrains.kotlin.resolve.PlatformConfigurator @@ -36,12 +37,13 @@ class KonanBuiltIns: KotlinBuiltIns { object KonanPlatform : TargetPlatform("Konan") { override val multiTargetPlatform = MultiTargetPlatform.Specific(platformName) - override val defaultImports: List = Default.defaultImports + listOf( - ImportPath("kotlin.*"), - ImportPath("kotlin.collections.*"), - ImportPath("kotlin.io.*"), - ImportPath("konan.*") - ) + override fun getDefaultImports(languageVersionSettings: LanguageVersionSettings): List = + Default.getDefaultImports(languageVersionSettings) + listOf( + ImportPath("kotlin.*"), + ImportPath("kotlin.collections.*"), + ImportPath("kotlin.io.*"), + ImportPath("konan.*") + ) override val platformConfigurator: PlatformConfigurator = KonanPlatformConfigurator diff --git a/gradle.properties b/gradle.properties index 8d5b87c39d9..c23dee06f65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ kotlin_version=1.1-M03 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT -kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170206.215253-402 +kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170208.143952-408 \ No newline at end of file