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

Report error on incompatible .kotlin_module files in classpath

Browse Source 
Also remove obsolete test wrongAbiVersionNoErrors

 #KT-25973 Fixed
 #KT-26266 Open
This commit is contained in:
Alexander Udalov
2018-08-17 19:01:26 +02:00
parent 4f11812668
commit 852760b3b0
19 changed files with 105 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMappingUtil.kt
+5 -2
View File
@@ -5,17 +5,20 @@
package org.jetbrains.kotlin.load.kotlin
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
import org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
fun ModuleMapping.Companion.loadModuleMapping(
bytes: ByteArray?,
debugName: String,
configuration: DeserializationConfiguration
configuration: DeserializationConfiguration,
reportIncompatibleVersionError: (JvmMetadataVersion) -> Unit
): ModuleMapping =
loadModuleMapping(
bytes,
debugName,
configuration.skipMetadataVersionCheck,
configuration.isJvmPackageNameSupported
configuration.isJvmPackageNameSupported,
reportIncompatibleVersionError
)