azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: make build compilable with 1.1-20170215.165623-424 (#246)

Browse Source
This commit is contained in:
vvlevchenko
2017-02-15 22:29:32 +03:00
committed by Nikolay Igotti
parent ed2bc1a425
commit 00dccf6175
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializationUtil.kt
+1 -2
View File
@@ -75,8 +75,7 @@ internal fun deserializeModule(configuration: CompilerConfiguration,
val storageManager = LockBasedStorageManager() val storageManager = LockBasedStorageManager()
val moduleDescriptor = ModuleDescriptorImpl( val moduleDescriptor = ModuleDescriptorImpl(
Name.special(moduleName), storageManager, KonanPlatform.builtIns) Name.special(moduleName), storageManager, KonanPlatform.builtIns)
val deserialization_config = CompilerDeserializationConfiguration( val deserialization_config = CompilerDeserializationConfiguration(configuration)
configuration.get(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, LanguageVersionSettingsImpl.DEFAULT))
val libraryAsByteArray = base64Decode(base64) val libraryAsByteArray = base64Decode(base64)
gradle.properties
+2 -1
View File
@@ -1,3 +1,4 @@
kotlin_version=1.1-M03 kotlin_version=1.1-M03
#kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT
kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170208.143952-408 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170208.143952-408
kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170215.165623-424