From 4c1cad326bfc47b3f248319c8072710e42265377 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 18 Feb 2019 13:22:08 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.30-dev-1764 --- gradle.properties | 6 +++--- .../plugin/experimental/plugins/KotlinNativeBasePlugin.kt | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 77cf79ec3e5..1e30046d9ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,9 +18,9 @@ buildKotlinVersion=1.3.30-dev-1297 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1297,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-1505,branch:default:true,pinned:true/artifacts/content/maven -kotlinVersion=1.3.30-dev-1505 -testKotlinVersion=1.3.30-dev-1505 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1764,branch:default:true,pinned:true/artifacts/content/maven +kotlinVersion=1.3.30-dev-1764 +testKotlinVersion=1.3.30-dev-1764 konanVersion=1.2.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4 diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt index 7d619661ed8..bd4d1f1108f 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt @@ -33,7 +33,6 @@ import org.gradle.language.cpp.CppBinary import org.gradle.language.plugins.NativeBasePlugin import org.gradle.nativeplatform.test.tasks.RunTestExecutable import org.gradle.util.GradleVersion -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.gradle.plugin.NATIVE_COMPILER_PLUGIN_CLASSPATH_CONFIGURATION_NAME import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME import org.jetbrains.kotlin.gradle.plugin.SubpluginEnvironment @@ -151,7 +150,7 @@ class KotlinNativeBasePlugin: Plugin { it.description = "Compiles Kotlin/Native source set '${binary.sourceSet.name}' into a ${binary.kind.name.toLowerCase()}" SubpluginEnvironment.loadSubplugins(this, kotlinVersion) - .addSubpluginOptions(this, it, it.compilerPluginOptions) + .addSubpluginOptions(this, it, it.compilerPluginOptions) it.compilerPluginClasspath = project.configurations.getByName(NATIVE_COMPILER_PLUGIN_CLASSPATH_CONFIGURATION_NAME) // Register an API header produced for shared/static library as a task output.