From be8984ef81bf76f5f4ef1e9b9f255241a2b86c33 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 7 May 2018 16:46:40 +0300 Subject: [PATCH] [kotlin compiler][update] 1.2.50-dev-1148 --- .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 7 +++++++ gradle.properties | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index b72335ea142..07996096605 100644 --- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.backend.konan.* import org.jetbrains.kotlin.backend.konan.util.profile import org.jetbrains.kotlin.cli.common.CLICompiler import org.jetbrains.kotlin.cli.common.CLITool +import org.jetbrains.kotlin.cli.common.CommonCompilerPerformanceManager import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles @@ -37,8 +38,14 @@ import org.jetbrains.kotlin.konan.target.CompilerOutputKind import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.utils.KotlinPaths +private class K2NativeCompilerPerformanceManager: CommonCompilerPerformanceManager("Kotlin to Native Compiler") class K2Native : CLICompiler() { + private val performanceManager by lazy { + K2NativeCompilerPerformanceManager() + } + override fun getPerformanceManager(): CommonCompilerPerformanceManager = performanceManager + override fun doExecute(@NotNull arguments: K2NativeCompilerArguments, @NotNull configuration: CompilerConfiguration, @NotNull rootDisposable: Disposable, diff --git a/gradle.properties b/gradle.properties index a0e1306385a..e562ac80756 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.50-dev-1070,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.2.50-dev-1070 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.50-dev-1148,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.2.50-dev-1148 konanVersion=0.8 org.gradle.jvmargs='-Dfile.encoding=UTF-8'