Merge pull request #68 from apptentive/xcframework

Replace static library with xcframework

CHANGELOG.md

@@ -5,6 +5,11 @@ This document lets you know what has changed in the Cordova plugin. For changes
 - [Android Changelog](https://github.com/apptentive/apptentive-android/blob/master/CHANGELOG.md)
 - [iOS Changelog](https://github.com/apptentive/apptentive-ios/blob/master/CHANGELOG.md)
 
+# 2020-09-16 - v5.5.2
+
+- Apptentive Android SDK: 5.5.4
+- Apptentive iOS SDK: 5.3.1
+
 # 2020-09-08 - v5.5.1
 
 - Apptentive Android SDK: 5.5.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apptentive-cordova",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "Apptentive Plugin For Cordova",
   "cordova": {
     "id": "apptentive-cordova",

plugin.xml

@@ -83,10 +83,6 @@
         <source-file src="src/ios/ApptentiveBridge.m" target-dir="Apptentive"/>
 
         <!-- Apptentive SDK -->
-        <source-file src="src/ios/apptentive_ios_sdk/libapptentive-ios.a" framework="true" target-dir="apptentive_ios_sdk"/>
-        <resource-file src="src/ios/apptentive_ios_sdk/ApptentiveResources.bundle" target-dir="apptentive_ios_sdk"/>
-        <header-file src="src/ios/apptentive_ios_sdk/include/Apptentive.h" target-dir="apptentive_ios_sdk"/>
-        <header-file src="src/ios/apptentive_ios_sdk/include/ApptentiveStyleSheet.h" target-dir="apptentive_ios_sdk"/>
         <resource-file src="src/ios/ApptentiveStyles.plist"/>
 
         <!-- required system frameworks -->
@@ -99,6 +95,7 @@
         <framework src="Storekit.framework" weak="true"/>
         <framework src="SystemConfiguration.framework" weak="true"/>
         <framework src="UIKit.framework" weak="true"/>
+        <framework src="src/ios/Apptentive.xcframework" custom="true"/>
     </platform>
 
 </plugin>

src/ios/Apptentive.xcframework/Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_i386_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>Apptentive.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>i386</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_armv7</string>
+			<key>LibraryPath</key>
+			<string>Apptentive.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>armv7</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

src/ios/Apptentive.xcframework/ios-arm64_armv7/Apptentive.framework/Headers/Apptentive.h

@@ -0,0 +1,15 @@
+//
+//  Apptentive.h
+//  Apptentive
+//
+//  Created by Frank Schmitt on 9/15/20.
+//  Copyright © 2020 Apptentive, Inc. All rights reserved.
+//
+
+#ifndef Apptentive_h
+#define Apptentive_h
+
+#import <Apptentive/ApptentiveMain.h>
+#import <Apptentive/ApptentiveStyleSheet.h>
+
+#endif /* Apptentive_h */

src/ios/apptentive_ios_sdk/include/Apptentive.h → src/ios/Apptentive.xcframework/ios-arm64_armv7/Apptentive.framework/Headers/ApptentiveMain.h

@@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
 FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];
 
 /** The version number of the Apptentive SDK. */
-#define kApptentiveVersionString @"5.2.14"
+#define kApptentiveVersionString @"5.3.0"
 
 /** The version number of the Apptentive API platform. */
 #define kApptentiveAPIVersionString @"9"
@@ -884,12 +884,6 @@ typedef NSString *ApptentiveStyleIdentifier NS_EXTENSIBLE_STRING_ENUM;
 
 @end
 
-NS_ASSUME_NONNULL_END
-
-#import "ApptentiveStyleSheet.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
 /// The text style for the title text of the greeting view in Message Center.
 extern ApptentiveStyleIdentifier ApptentiveTextStyleBody NS_SWIFT_NAME(body);
 

src/ios/apptentive_ios_sdk/include/ApptentiveStyleSheet.h → src/ios/Apptentive.xcframework/ios-arm64_armv7/Apptentive.framework/Headers/ApptentiveStyleSheet.h

@@ -6,7 +6,6 @@
 //  Copyright © 2016 Apptentive, Inc. All rights reserved.
 //
 
-#import "Apptentive.h"
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN

src/ios/Apptentive.xcframework/ios-arm64_armv7/Apptentive.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module Apptentive {
+  umbrella header "Apptentive.h"
+
+  export *
+  module * { export * }
+}

src/ios/Apptentive.xcframework/ios-arm64_i386_x86_64-simulator/Apptentive.framework/Headers/Apptentive.h

@@ -0,0 +1,15 @@
+//
+//  Apptentive.h
+//  Apptentive
+//
+//  Created by Frank Schmitt on 9/15/20.
+//  Copyright © 2020 Apptentive, Inc. All rights reserved.
+//
+
+#ifndef Apptentive_h
+#define Apptentive_h
+
+#import <Apptentive/ApptentiveMain.h>
+#import <Apptentive/ApptentiveStyleSheet.h>
+
+#endif /* Apptentive_h */