SDK-290 Fix iOS SDK Header Exports for Objective-C++ Compatibility (#1002)

Author: joaodordio

Iterable-iOS-SDK.podspec

@@ -20,12 +20,13 @@ Pod::Spec.new do |s|
   s.documentation_url = "https://support.iterable.com/hc/en-us/articles/360035018152-Iterable-s-iOS-SDK"
 
   s.pod_target_xcconfig = {
-    'SWIFT_VERSION' => '5.3'
+    'SWIFT_VERSION' => '5.3',
+    'DEFINES_MODULE' => 'YES',
   }
 
   s.swift_version = '5.3'
 
-  s.resource_bundles = {'Resources' => 'swift-sdk/Resources/**/*.{storyboard,xib,xcassets,xcdatamodeld}' }
+  s.resource_bundles = {'IterableSDKResources' => 'swift-sdk/Resources/**/*.{storyboard,xib,xcassets,xcdatamodeld}' }
 
   s.header_dir = 'IterableSDK'
 end

notification-extension/IterableAppExtensions.h

@@ -7,6 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //! Project version number for swift_sdk.
 FOUNDATION_EXPORT double swift_sdkVersionNumber;
 
@@ -15,4 +19,8 @@ FOUNDATION_EXPORT const unsigned char swift_sdkVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <swift_sdk/PublicHeader.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* IterableAppExtensions_h */

swift-sdk/Internal/Utilities/ResourceHelper.swift

@@ -18,11 +18,13 @@ struct ResourceHelper {
 
     private static let spmPackageName = "IterableSDK"
     private static let spmLibraryName = "IterableSDK"
-    private static let cocoaPodsResourceBundleName = "Resources"
+    static let cocoaPodsResourceBundleName = "IterableSDKResources"
+    private static let legacyCocoaPodsResourceBundleName = "Resources"
 
     private static let possibleSubBundleNames = [
         "\(spmPackageName)_\(spmLibraryName)",
-        "\(cocoaPodsResourceBundleName)"
+        "\(cocoaPodsResourceBundleName)",
+        "\(legacyCocoaPodsResourceBundleName)"
     ]
 
     private static func findSubBundle(forBundle bundle: Bundle) -> Bundle? {

swift-sdk/IterableSDK.h

@@ -4,6 +4,10 @@
 
 #import <UIKit/UIKit.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //! Project version number for swift_sdk.
 FOUNDATION_EXPORT double swift_sdkVersionNumber;
 
@@ -12,3 +16,7 @@ FOUNDATION_EXPORT const unsigned char swift_sdkVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <swift_sdk/PublicHeader.h>
 
+#ifdef __cplusplus
+}
+#endif
+

swift-sdk/ui-components/uikit/IterableEmbeddedView.swift

@@ -207,8 +207,11 @@ public class IterableEmbeddedView: UIView {
     func loadViewFromNib() -> UIView? {
         var nib: UINib
         #if COCOAPODS
-            let bundle = Bundle(path: Bundle(for: IterableEmbeddedView.self).path(forResource: "Resources", ofType: "bundle")!)
-            nib = UINib(nibName: "IterableEmbeddedView", bundle: bundle)
+            if let bundle = Self.findCocoaPodsResourceBundle() {
+                nib = UINib(nibName: "IterableEmbeddedView", bundle: bundle)
+            } else {
+                nib = UINib(nibName: "IterableEmbeddedView", bundle: Bundle.main)
+            }
         #else
             #if SWIFT_PACKAGE
                 nib = UINib(nibName: "IterableEmbeddedView", bundle: Bundle.module)
@@ -222,7 +225,24 @@ public class IterableEmbeddedView: UIView {
         return view
     }
 
-    
+    private static let cocoaPodsResourceBundleNames = [
+        ResourceHelper.cocoaPodsResourceBundleName,
+        "Resources" // legacy name for cached pod builds
+    ]
+
+    private static func findCocoaPodsResourceBundle() -> Bundle? {
+        let searchBundles = [Bundle.main, Bundle(for: IterableEmbeddedView.self)]
+        for name in cocoaPodsResourceBundleNames {
+            for parent in searchBundles {
+                if let path = parent.path(forResource: name, ofType: "bundle"),
+                   let bundle = Bundle(path: path) {
+                    return bundle
+                }
+            }
+        }
+        return nil
+    }
+
     public func configure(message: IterableEmbeddedMessage, viewType: IterableEmbeddedViewType, config: IterableEmbeddedViewConfig?) {
 
         self.message = message