diff --git a/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt b/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt index 2c49a243232..dd018858bf1 100644 --- a/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt +++ b/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt @@ -4,13 +4,14 @@ import org.jetbrains.kotlin.container.StorageComponentContainer import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.ModuleStructureOracle import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker import org.jetbrains.kotlin.resolve.inline.ReasonableInlineRule import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker object KonanPlatformConfigurator : PlatformConfiguratorBase( - additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()), + additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker(ModuleStructureOracle.SingleModule, emptyList())), additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker()) ) { override fun configureModuleComponents(container: StorageComponentContainer) { diff --git a/gradle.properties b/gradle.properties index f2945d24bae..cb86e47f4c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ buildKotlinVersion=1.3.50-dev-1010 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-1010,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-1010,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.3.50-dev-1010 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-1050,branch:default:any,pinned:true/artifacts/content/maven +kotlinVersion=1.3.50-dev-1050 kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-1010,branch:default:any,pinned:true/artifacts/content/maven kotlinStdlibVersion=1.3.50-dev-1010 testKotlinCompilerVersion=1.3.50-dev-630 diff --git a/gradle/kotlinGradlePlugin.gradle b/gradle/kotlinGradlePlugin.gradle index 8f239670e82..99532e09320 100644 --- a/gradle/kotlinGradlePlugin.gradle +++ b/gradle/kotlinGradlePlugin.gradle @@ -11,6 +11,9 @@ project.buildscript.repositories { maven { url buildKotlinCompilerRepo } + maven { + url kotlinCompilerRepo + } maven { url 'https://cache-redirector.jetbrains.com/maven-central' }