Merge pull request #355 from SUPLA/develop

v24.02
SUPLA · Feb 28, 2024 · ed95002 · ed95002
2 parents fc70cf0 + 4d7bb94
commit ed95002
Show file tree

Hide file tree

Showing 550 changed files with 14,354 additions and 1,876 deletions.
diff --git a/LibSsl.xcframework/Info.plist b/LibSsl.xcframework/Info.plist
@@ -6,39 +6,39 @@
 	<array>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libssl-os.a</string>
+			<string>libssl-sim.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>libssl-os.a</string>
+			<string>libssl-sim.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>armv7</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libssl-sim.a</string>
+			<string>libssl-os.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64_armv7</string>
 			<key>LibraryPath</key>
-			<string>libssl-sim.a</string>
+			<string>libssl-os.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/LibSsl.xcframework/ios-arm64_armv7/libssl-os.a b/LibSsl.xcframework/ios-arm64_armv7/libssl-os.a
diff --git a/LibSsl.xcframework/ios-arm64_x86_64-simulator/libssl-sim.a b/LibSsl.xcframework/ios-arm64_x86_64-simulator/libssl-sim.a
diff --git a/LibSuplaClient.xcframework/Info.plist b/LibSuplaClient.xcframework/Info.plist
@@ -6,40 +6,40 @@
 	<array>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libsupla-client-iphoneos.a</string>
+			<string>libsupla-client-iphonesimulator.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7_armv7s</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>libsupla-client-iphoneos.a</string>
+			<string>libsupla-client-iphonesimulator.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>armv7</string>
-				<string>armv7s</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libsupla-client-iphonesimulator.a</string>
+			<string>libsupla-client-iphoneos.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64_armv7_armv7s</string>
 			<key>LibraryPath</key>
-			<string>libsupla-client-iphonesimulator.a</string>
+			<string>libsupla-client-iphoneos.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>armv7</string>
+				<string>armv7s</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>