From 7c3eda31fa176dcfa7a81b82496806bde65b2892 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 15 Jul 2020 17:38:19 +0700 Subject: [PATCH] Gradle, CocoaPods: Fix non-compilable dummy header Issue #KT-39999 fixed --- .../kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt | 2 +- .../main/resources/cocoapods/dummy.framework/Headers/dummy.h | 5 ----- .../cocoapods/dummy.framework/Headers/placeholder.h | 1 + .../cocoapods/dummy.framework/Modules/module.modulemap | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/dummy.h create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/placeholder.h diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt index 6580616b5a4..462c7779145 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt @@ -225,7 +225,7 @@ open class DummyFrameworkTask : DefaultTask() { // Copy files for the dummy framework. copyFrameworkFile("Info.plist") copyFrameworkFile("dummy", frameworkNameProvider.get()) - copyFrameworkFile("Headers/dummy.h") + copyFrameworkFile("Headers/placeholder.h") copyFrameworkTextFile("Modules/module.modulemap") { if (it == "framework module dummy {") { it.replace("dummy", frameworkNameProvider.get()) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/dummy.h b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/dummy.h deleted file mode 100644 index a91320276ef..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/dummy.h +++ /dev/null @@ -1,5 +0,0 @@ -//! Project version number for dummy. -FOUNDATION_EXPORT double dummyVersionNumber; - -//! Project version string for dummy. -FOUNDATION_EXPORT const unsigned char dummyVersionString[]; diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/placeholder.h b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/placeholder.h new file mode 100644 index 00000000000..8a2918ac13f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Headers/placeholder.h @@ -0,0 +1 @@ +// Autogenerated placeholder header. Do not edit manually. diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Modules/module.modulemap b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Modules/module.modulemap index 9a96072c648..95dec0ac93b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Modules/module.modulemap +++ b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Modules/module.modulemap @@ -1,5 +1,5 @@ framework module dummy { - umbrella header "dummy.h" + umbrella header "placeholder.h" export * module * { export * }