Merge pull request #3 from garmin/bugfixRelease

Several bug fixes and code improvements.
garmin · Mar 4, 2024 · d61f5b7 · d61f5b7
2 parents 8c5ac2a + 09a16d0
commit d61f5b7
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 165 deletions.
diff --git a/ConnectIQ.xcframework/Info.plist b/ConnectIQ.xcframework/Info.plist
@@ -5,31 +5,35 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>ConnectIQ.framework/ConnectIQ</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ConnectIQ.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>ConnectIQ.framework/ConnectIQ</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ConnectIQ.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/ConnectIQ b/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/ConnectIQ
diff --git a/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/ConnectIQ.h b/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/ConnectIQ.h
@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQConstants.h"
-#import "IQDevice.h"
-#import "IQApp.h"
+#import <ConnectIQ/IQConstants.h>
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQApp.h>
 
 // --------------------------------------------------------------------------------
 #pragma mark - PUBLIC TYPES

diff --git a/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/IQApp.h b/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/IQApp.h
@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQDevice.h"
-#import "IQAppStatus.h"
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQAppStatus.h>
 
 /// @brief  Represents an instance of a ConnectIQ app that is installed on a
 ///         Garmin device.

diff --git a/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Info.plist b/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Info.plist
diff --git a/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Modules/module.modulemap b/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Modules/module.modulemap
@@ -1,6 +1,6 @@
 framework module ConnectIQ {
   umbrella header "ConnectIQ.h"
-
   export *
+
   module * { export * }
 }
diff --git a/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/ConnectIQ b/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/ConnectIQ
diff --git a/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/ConnectIQ.h b/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/ConnectIQ.h
@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQConstants.h"
-#import "IQDevice.h"
-#import "IQApp.h"
+#import <ConnectIQ/IQConstants.h>
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQApp.h>
 
 // --------------------------------------------------------------------------------
 #pragma mark - PUBLIC TYPES

diff --git a/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/IQApp.h b/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/IQApp.h
@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQDevice.h"
-#import "IQAppStatus.h"
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQAppStatus.h>
 
 /// @brief  Represents an instance of a ConnectIQ app that is installed on a
 ///         Garmin device.

diff --git a/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Info.plist b/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Info.plist
diff --git a/...ectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Modules/module.modulemap b/...ectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Modules/module.modulemap
@@ -1,6 +1,6 @@
 framework module ConnectIQ {
   umbrella header "ConnectIQ.h"
-
   export *
+
   module * { export * }
 }