From 599f1889591bc80c55b206b077b9918b4215466b Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 31 Jan 2019 13:25:05 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.30-dev-1296 --- .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 3 +-- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 5 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 72749d4b423..03df269a876 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 @@ -35,10 +35,9 @@ private class K2NativeCompilerPerformanceManager: CommonCompilerPerformanceManag class K2Native : CLICompiler() { override fun createMetadataVersion(p0: IntArray): BinaryVersion = KonanMetadataVersion(*p0) - private val performanceManager by lazy { + override val performanceManager:CommonCompilerPerformanceManager by lazy { K2NativeCompilerPerformanceManager() } - override fun getPerformanceManager(): CommonCompilerPerformanceManager = performanceManager override fun doExecute(@NotNull arguments: K2NativeCompilerArguments, @NotNull configuration: CompilerConfiguration, diff --git a/gradle.properties b/gradle.properties index 750e84c68d1..8bbe14c2e31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,9 +18,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 -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1157,pinned:true/artifacts/content/maven -kotlinVersion=1.3.30-dev-1157 -testKotlinVersion=1.3.30-dev-1157 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1296,pinned:true/artifacts/content/maven +kotlinVersion=1.3.30-dev-1296 +testKotlinVersion=1.3.30-dev-1296 konanVersion=1.2.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4