compiler: 1.1-20170208.143952-408

This commit is contained in:
Ilya Matveev
2017-02-08 17:35:30 +03:00
committed by ilmat192
parent b9e2122497
commit 369c4d1959
2 changed files with 9 additions and 7 deletions
@@ -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<ImportPath> = Default.defaultImports + listOf(
ImportPath("kotlin.*"),
ImportPath("kotlin.collections.*"),
ImportPath("kotlin.io.*"),
ImportPath("konan.*")
)
override fun getDefaultImports(languageVersionSettings: LanguageVersionSettings): List<ImportPath> =
Default.getDefaultImports(languageVersionSettings) + listOf(
ImportPath("kotlin.*"),
ImportPath("kotlin.collections.*"),
ImportPath("kotlin.io.*"),
ImportPath("konan.*")
)
override val platformConfigurator: PlatformConfigurator = KonanPlatformConfigurator
+1 -1
View File
@@ -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