diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt index ed9f466f7fe..5fb0eea963b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.container.useInstance import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.resolve.IdentifierChecker import org.jetbrains.kotlin.resolve.OverloadFilter +import org.jetbrains.kotlin.resolve.OverridesBackwardCompatibilityHelper import org.jetbrains.kotlin.resolve.PlatformConfigurator import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator import org.jetbrains.kotlin.resolve.lazy.DelegationFilter @@ -42,7 +43,8 @@ object KonanPlatformConfigurator : PlatformConfigurator( identifierChecker = IdentifierChecker.DEFAULT, overloadFilter = OverloadFilter.DEFAULT, platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY, - delegationFilter = DelegationFilter.DEFAULT // TODO: fixme + delegationFilter = DelegationFilter.DEFAULT, + overridesBackwardCompatibilityHelper = OverridesBackwardCompatibilityHelper.DEFAULT ) { override fun configureModuleComponents(container: StorageComponentContainer) { container.useInstance(SyntheticScopes.Empty) diff --git a/gradle.properties b/gradle.properties index e04f3f59daa..63983f73041 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,4 +3,5 @@ kotlin_version=1.1-M03 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161201.112229-281 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161209.125829-302 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161217.025654-317 -kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161219.154657-321 +#kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161219.154657-321 +kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161224.154011-334