From 64a69951e1f0f03c5ad1c9cf803054b43ac4b4c6 Mon Sep 17 00:00:00 2001 From: Yurii Date: Fri, 10 Mar 2023 17:51:55 +0200 Subject: [PATCH] Introduce GliaWidgets framework as xcframework GliaWidgets-xcframework target has been introduced to provide choice for integrator use GliaWidgets as a Swift Package or xcframework. --- GliaWidgets/Info.plist | 2 +- GliaWidgets/StaticValues.swift | 2 +- GliaWidgetsTests/Info.plist | 2 +- Package.swift | 31 +++++++++++++++++++ .../GliaWidgetsSDK.swift | 1 + TestingApp/Info.plist | 2 +- bitrise.yml | 3 +- 7 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 Sources/GliaWidgetsSDK-xcframework/GliaWidgetsSDK.swift diff --git a/GliaWidgets/Info.plist b/GliaWidgets/Info.plist index 25330688b..2540c24b0 100644 --- a/GliaWidgets/Info.plist +++ b/GliaWidgets/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 0.10.8 + 0.10.9 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/GliaWidgets/StaticValues.swift b/GliaWidgets/StaticValues.swift index ec3376370..e212fcac2 100644 --- a/GliaWidgets/StaticValues.swift +++ b/GliaWidgets/StaticValues.swift @@ -6,5 +6,5 @@ final class StaticValues { /// version cannot be changed by integrators, so this ensures that our code will /// always have the correct version regardless of what our integrators do with /// our plist files. - static let sdkVersion = "0.10.8" + static let sdkVersion = "0.10.9" } diff --git a/GliaWidgetsTests/Info.plist b/GliaWidgetsTests/Info.plist index ed00e4ec6..c37bb023f 100644 --- a/GliaWidgetsTests/Info.plist +++ b/GliaWidgetsTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 0.10.8 + 0.10.9 CFBundleVersion 1 diff --git a/Package.swift b/Package.swift index a7e32f8cc..4681d62ed 100644 --- a/Package.swift +++ b/Package.swift @@ -11,6 +11,10 @@ let package = Package( .library( name: "GliaWidgets", targets: ["GliaWidgetsSDK"] + ), + .library( + name: "GliaWidgets-xcframework", + targets: ["GliaWidgetsSDK-xcframework"] ) ], dependencies: [ @@ -38,6 +42,21 @@ let package = Package( url: "https://github.com/salemove/ios-bundle/releases/download/0.35.6/SalemoveSDK.xcframework.zip", checksum: "0a371206cd0e67fd21ca098f5af3f6da9c4438d679f98e75dd64102a0f853c8f" ), + .binaryTarget( + name: "PureLayoutXcf", + url: "https://github.com/salemove/ios-sdk-widgets/releases/download/0.10.8/PureLayoutXcf.xcframework.zip", + checksum: "93f00268ba710a0ee513be7cef94a385637bfb76c292942cc5f062a7b2f0037b" + ), + .binaryTarget( + name: "LottieXcf", + url: "https://github.com/salemove/ios-sdk-widgets/releases/download/0.10.8/LottieXcf.xcframework.zip", + checksum: "9f2340bfb15f734ebd3a4e79d67ce3581822aa5ceec3a37a38ebaa505bf1a8a3" + ), + .binaryTarget( + name: "GliaWidgetsXcf", + url: "https://github.com/salemove/ios-sdk-widgets/releases/download/0.10.8/GliaWidgetsXcf.xcframework.zip", + checksum: "3deacedffc912751d8a597d56d17b33b20191679c10d7c909222a0baefb6a137" + ), .target( name: "GliaWidgets", dependencies: [ @@ -63,6 +82,18 @@ let package = Package( "WebRTC", "GliaWidgets" ] + ), + .target( + name: "GliaWidgetsSDK-xcframework", + dependencies: [ + "SalemoveSDK", + "GliaWidgetsXcf", + "GliaCoreDependency", + "TwilioVoice", + "WebRTC", + "PureLayoutXcf", + "LottieXcf" + ] ) ] ) diff --git a/Sources/GliaWidgetsSDK-xcframework/GliaWidgetsSDK.swift b/Sources/GliaWidgetsSDK-xcframework/GliaWidgetsSDK.swift new file mode 100644 index 000000000..75f2ba643 --- /dev/null +++ b/Sources/GliaWidgetsSDK-xcframework/GliaWidgetsSDK.swift @@ -0,0 +1 @@ +struct GliaWidgetsSDK { } diff --git a/TestingApp/Info.plist b/TestingApp/Info.plist index de9507546..096c62e45 100644 --- a/TestingApp/Info.plist +++ b/TestingApp/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 0.10.8 + 0.10.9 CFBundleURLTypes diff --git a/bitrise.yml b/bitrise.yml index 06c66e79a..f112b6a14 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -401,4 +401,5 @@ trigger_map: workflow: pull-request meta: bitrise.io: - stack: osx-xcode-13.3.x + stack: osx-xcode-14.2.x-ventura + machine_type_id: g2-m1.4core