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

[kotlin compiler][update] 1.3.50-dev-1050

Browse Source
This commit is contained in:
Igor Chevdar
2019-06-13 14:00:50 +03:00
parent ee42b35581
commit 29e0dfc029
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt
+2 -1
View File
@@ -4,13 +4,14 @@ import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.ModuleStructureOracle
import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
import org.jetbrains.kotlin.resolve.inline.ReasonableInlineRule import org.jetbrains.kotlin.resolve.inline.ReasonableInlineRule
import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker
object KonanPlatformConfigurator : PlatformConfiguratorBase( object KonanPlatformConfigurator : PlatformConfiguratorBase(
additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()), additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker(ModuleStructureOracle.SingleModule, emptyList())),
additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker()) additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker())
) { ) {
override fun configureModuleComponents(container: StorageComponentContainer) { override fun configureModuleComponents(container: StorageComponentContainer) {
gradle.properties
+2 -2
View File
@@ -18,8 +18,8 @@
buildKotlinVersion=1.3.50-dev-1010 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 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 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 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-1010 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 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 kotlinStdlibVersion=1.3.50-dev-1010
testKotlinCompilerVersion=1.3.50-dev-630 testKotlinCompilerVersion=1.3.50-dev-630
gradle/kotlinGradlePlugin.gradle
+3
View File
@@ -11,6 +11,9 @@ project.buildscript.repositories {
maven { maven {
url buildKotlinCompilerRepo url buildKotlinCompilerRepo
} }
maven {
url kotlinCompilerRepo
}
maven { maven {
url 'https://cache-redirector.jetbrains.com/maven-central' url 'https://cache-redirector.jetbrains.com/maven-central'
} }