From 62be127935dc142a4b0c2c6952d863b89826a9a9 Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Thu, 28 Feb 2019 10:24:58 +0300 Subject: [PATCH] Fix setting -shims flag in interop plugin (#2729) --- .../groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy | 4 ++-- .../kotlin/gradle/plugin/test/IncrementalSpecification.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy index 0c9c4a98a64..3458621ea19 100644 --- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy +++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy @@ -254,8 +254,8 @@ class NamedNativeInteropConfig implements Named { args '-header', it } - if (project.hasProperty('shims')) { - args '-shims', project.ext.shims + if (project.hasProperty('shims') && project.ext.shims) { + args '-shims' } } diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/IncrementalSpecification.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/IncrementalSpecification.groovy index ac466fa8825..c6b679b6ea0 100644 --- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/IncrementalSpecification.groovy +++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/IncrementalSpecification.groovy @@ -208,7 +208,7 @@ class IncrementalSpecification extends BaseKonanSpecification { "linkerOpts" | "'--help'" "includeDirs" | "'src'" "includeDirs.allHeaders" | "'src'" - "extraOpts" | "'-shims', 'false'" + "extraOpts" | "'-shims'" "noDefaultLibs" | "true" }