From 02331fbd7ec0c497ddaaba822194b008aedce4fd Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Fri, 26 Apr 2019 13:34:14 +0300 Subject: [PATCH] Unify compiler and cinterop flags names (#2294) --- build.gradle.kts | 2 +- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1f5bdb4475c..35bb7b911ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -160,7 +160,7 @@ extra["versions.trove4j"] = "1.0.20181211" extra["versions.kotlin-native-shared"] = "1.0-dev-40" if (!project.hasProperty("versions.kotlin-native")) { - extra["versions.kotlin-native"] = "1.3-dev-9457" + extra["versions.kotlin-native"] = "1.3-dev-9780" } val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index e947867ddc7..1e3546e0ab9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -523,18 +523,18 @@ open class CInteropProcess : DefaultTask() { addFileArgs("-header", headers) compilerOpts.forEach { - addArg("-compilerOpt", it) + addArg("-compiler-option", it) } linkerOpts.forEach { - addArg("-linkerOpt", it) + addArg("-linker-option", it) } libraries.files.filterExternalKlibs(project).forEach { library -> addArg("-library", library.absolutePath) } - addArgs("-compilerOpt", allHeadersDirs.map { "-I${it.absolutePath}" }) + addArgs("-compiler-option", allHeadersDirs.map { "-I${it.absolutePath}" }) addArgs("-headerFilterAdditionalSearchPrefix", headerFilterDirs.map { it.absolutePath }) addAll(extraOpts)