From 55cd88cde9f5e548f48f872aefe8f298024c3a69 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 15 Oct 2018 11:50:50 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.20-dev-863 --- .../src/org/jetbrains/kotlin/backend/konan/KonanLower.kt | 1 + .../backend/konan/lower/ExpectDeclarationsRemoving.kt | 1 + gradle.properties | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt index d5fa775f773..5352e6e82ba 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.backend.konan import org.jetbrains.kotlin.backend.common.runOnFilePostfix import org.jetbrains.kotlin.backend.common.lower.* import org.jetbrains.kotlin.backend.konan.lower.* +import org.jetbrains.kotlin.backend.konan.lower.ExpectDeclarationsRemoving import org.jetbrains.kotlin.backend.konan.lower.FinallyBlocksLowering import org.jetbrains.kotlin.backend.konan.lower.InitializersLowering import org.jetbrains.kotlin.backend.konan.lower.LateinitLowering diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt index cea0cb41473..84f615c9ce0 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver /** * This pass removes all declarations with `isExpect == true`. + * Note: org.jetbrains.kotlin.backend.common.lower.ExpectDeclarationsRemoving is copy of this lower. */ internal class ExpectDeclarationsRemoving(val context: Context) : FileLoweringPass { diff --git a/gradle.properties b/gradle.properties index 522d6d6027f..9eae76a9680 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,9 +19,9 @@ buildKotlinVersion=1.3.0-rc-116 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_CompilerAllPlugins),number:1.3.0-rc-116,tag:kotlin-native,pinned:true/artifacts/content/maven remoteRoot=konan_tests testDataVersion=1226829:id -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.20-dev-689,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.3.20-dev-689 -testKotlinVersion=1.3.20-dev-785 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.20-dev-863,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.3.20-dev-863 +testKotlinVersion=1.3.20-dev-863 konanVersion=1.1.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4