From 81c99a060f422869251c47f51dfc1b937ef4c60f Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 28 May 2018 12:17:43 +0300 Subject: [PATCH] [kotlin compiler][update] 1.2.60-dev-342 --- .../src/org/jetbrains/kotlin/ir/util/IrUtils2.kt | 4 ++-- gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt index 563626554fb..c641592a4e1 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt @@ -108,8 +108,8 @@ private fun createFakeOverride(descriptor: CallableMemberDescriptor, startOffset is PropertyDescriptor -> IrPropertyImpl(startOffset, endOffset, IrDeclarationOrigin.FAKE_OVERRIDE, descriptor).apply { // TODO: add field if getter is missing? - getter = descriptor.getter?.createFunction() - setter = descriptor.setter?.createFunction() + getter = descriptor.getter?.createFunction() as IrSimpleFunction? + setter = descriptor.setter?.createFunction() as IrSimpleFunction? } else -> TODO(descriptor.toString()) } diff --git a/gradle.properties b/gradle.properties index 97060398b56..7a018c2ea68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,8 +20,8 @@ remoteRoot=konan_tests #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler testDataVersion=1226829:id -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.60-dev-188,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.2.60-dev-188 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.60-dev-342,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.2.60-dev-342 konanVersion=0.8 org.gradle.jvmargs='-Dfile.encoding=UTF-8'