From 45052ded8e82b9789b2506c3bbf3a11f759e8fc2 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 5 Jun 2018 13:42:00 +0300 Subject: [PATCH] [kotlin compiler][update] 1.2.60-dev-444 --- .../org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt | 1 - gradle.properties | 4 ++-- performance/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt index 030d8bcf8a1..679de3a7b7e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt @@ -50,7 +50,6 @@ internal fun IrModuleFragment.replaceUnboundSymbols(context: Context) { this.transformChildrenVoid(IrUnboundSymbolReplacer(symbolTable, collector.descriptorToSymbol)) // Generate missing external stubs: - // TODO: ModuleGenerator::generateUnboundSymbolsAsDependencies(IRModuleFragment) is private function :/ @Suppress("DEPRECATION") ExternalDependenciesGenerator(symbolTable = context.psi2IrGeneratorContext.symbolTable, irBuiltIns = context.irBuiltIns).generateUnboundSymbolsAsDependencies(this) diff --git a/gradle.properties b/gradle.properties index 7a018c2ea68..8d408ebc20d 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-342,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.2.60-dev-342 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.60-dev-444,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.2.60-dev-444 konanVersion=0.8 org.gradle.jvmargs='-Dfile.encoding=UTF-8' diff --git a/performance/build.gradle b/performance/build.gradle index ea78c31e9ae..fbbca6766b6 100644 --- a/performance/build.gradle +++ b/performance/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$gradlePluginVersion" } } @@ -51,7 +51,7 @@ compileKotlin { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$buildKotlinVersion" } task jvmRun(type: JavaExec) {