Merge commits from both masters and update to 1.5.0-dev-500 compiler

Kotlin/Native base commit: ed1035eb82d63dde60823852276901aaeacb644b
This commit is contained in:
Stanislav Erokhin
2020-12-14 15:37:29 +01:00
3931 changed files with 108567 additions and 40072 deletions
+7 -7
View File
@@ -18,13 +18,13 @@
buildKotlinVersion=1.4.20-dev-2167
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.20-dev-2167,branch:default:any,pinned:true/artifacts/content/maven
remoteRoot=konan_tests
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.30-dev-3009,branch:default:any,pinned:true/artifacts/content/maven
kotlinVersion=1.4.30-dev-3009
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.30-dev-3009,branch:default:any,pinned:true/artifacts/content/maven
kotlinStdlibVersion=1.4.30-dev-3009
kotlinStdlibTestsVersion=1.4.30-dev-3009
testKotlinCompilerVersion=1.4.30-dev-3009
konanVersion=1.4.30
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.0-dev-500,branch:default:any,pinned:true/artifacts/content/maven
kotlinVersion=1.5.0-dev-500
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.0-dev-500,branch:default:any,pinned:true/artifacts/content/maven
kotlinStdlibVersion=1.5.0-dev-500
kotlinStdlibTestsVersion=1.5.0-dev-500
testKotlinCompilerVersion=1.5.0-dev-500
konanVersion=1.5.0
# A version of Xcode required to build the Kotlin/Native compiler.
xcodeMajorVersion=12