From efffe4e460eb71e276419a17f6df745506fa8ff9 Mon Sep 17 00:00:00 2001 From: Yuriy Ganushevich Date: Wed, 5 Jan 2022 15:05:08 +0100 Subject: [PATCH 1/4] Bump VoxeetSDK to v3.4.0-beta.1 and UXKit to 1.7.0-beta.1 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Sample/Cartfile | 2 +- Sample/Cartfile.resolved | 2 +- VoxeetUXKit.podspec | 2 +- VoxeetUXKit.xcodeproj/project.pbxproj | 8 ++++---- VoxeetUXKit/Other/settings.plist | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cartfile b/Cartfile index deccc47..287bdac 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/3.3.3/VoxeetSDK.json" ~> 3.0 +binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/v3.4.0-beta.1/VoxeetSDK.json" ~> 3.0 github "onevcat/Kingfisher" ~> 7.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index d8bef73..de2c204 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/3.3.3/VoxeetSDK.json" "3.3.3" +binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/v3.4.0-beta.1/VoxeetSDK.json" "3.4.0" github "onevcat/Kingfisher" "7.1.2" diff --git a/Sample/Cartfile b/Sample/Cartfile index 008a10a..5f1850c 100644 --- a/Sample/Cartfile +++ b/Sample/Cartfile @@ -1 +1 @@ -github "voxeet/voxeet-uxkit-ios" "release/1.6.5" +github "voxeet/voxeet-uxkit-ios" "release/1.7.0-beta.1" diff --git a/Sample/Cartfile.resolved b/Sample/Cartfile.resolved index d8bef73..de2c204 100644 --- a/Sample/Cartfile.resolved +++ b/Sample/Cartfile.resolved @@ -1,2 +1,2 @@ -binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/3.3.3/VoxeetSDK.json" "3.3.3" +binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/v3.4.0-beta.1/VoxeetSDK.json" "3.4.0" github "onevcat/Kingfisher" "7.1.2" diff --git a/VoxeetUXKit.podspec b/VoxeetUXKit.podspec index 8b5a8aa..475725c 100644 --- a/VoxeetUXKit.podspec +++ b/VoxeetUXKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "VoxeetUXKit" - spec.version = "1.6.5" + spec.version = "1.7.0-beta.1" spec.summary = "The Voxeet UXKit is a quick way of adding premium audio, video chats, and other supported options." spec.author = "Voxeet" spec.homepage = "https://dolby.io" diff --git a/VoxeetUXKit.xcodeproj/project.pbxproj b/VoxeetUXKit.xcodeproj/project.pbxproj index 804e89e..b15f266 100644 --- a/VoxeetUXKit.xcodeproj/project.pbxproj +++ b/VoxeetUXKit.xcodeproj/project.pbxproj @@ -584,7 +584,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = B55NRA8BRW; DYLIB_COMPATIBILITY_VERSION = 1; @@ -604,7 +604,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.6.5; + MARKETING_VERSION = 1.7.0; PRODUCT_BUNDLE_IDENTIFIER = com.voxeet.uxkit; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -618,7 +618,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = B55NRA8BRW; DYLIB_COMPATIBILITY_VERSION = 1; @@ -637,7 +637,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.6.5; + MARKETING_VERSION = 1.7.0; PRODUCT_BUNDLE_IDENTIFIER = com.voxeet.uxkit; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/VoxeetUXKit/Other/settings.plist b/VoxeetUXKit/Other/settings.plist index f5e6acb..49e6b06 100644 --- a/VoxeetUXKit/Other/settings.plist +++ b/VoxeetUXKit/Other/settings.plist @@ -21,8 +21,8 @@ NSPrincipalClass UXKitBuild - 0 + 1 UXKitVersion - 1.6.5 + 1.7.0 From 2a83fb39f0b71818b0afe67407a0aa944b11a42e Mon Sep 17 00:00:00 2001 From: Edyta Zugaj Date: Thu, 10 Feb 2022 11:26:50 +0100 Subject: [PATCH 2/4] Add arm64 support for simulator --- VoxeetUXKit.podspec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/VoxeetUXKit.podspec b/VoxeetUXKit.podspec index 475725c..8660e60 100644 --- a/VoxeetUXKit.podspec +++ b/VoxeetUXKit.podspec @@ -14,13 +14,9 @@ Pod::Spec.new do |spec| spec.dependency "VoxeetSDK", "~> 3.0" spec.dependency "Kingfisher" - # MacBook arm simulator isn't supported. spec.pod_target_xcconfig = { - 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64', 'ENABLE_BITCODE' => 'NO' # Disable bitcode to support dvclient.framework dependency. } - spec.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } - spec.license = { :type => "Dolby Software License Agreement", :text => <<-LICENSE **BEFORE DOWNLOADING THE SOFTWARE, PLEASE CAREFULLY READ THE FOLLOWING AGREEMENT. DO NOT DOWNLOAD, INSTALL, ACTIVATE OR USE THIS SOFTWARE IF YOU HAVE NOT From cb98cfc836ad3b4c240e77c283ec26a23f9fa392 Mon Sep 17 00:00:00 2001 From: Edyta Zugaj Date: Thu, 31 Mar 2022 16:50:58 +0200 Subject: [PATCH 3/4] Workaround for AVPlayer to not be interrupted by AVAudioSession deinitialisation --- .../Code/ViewControllers/ConferenceViewController.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/VoxeetUXKit/Code/ViewControllers/ConferenceViewController.swift b/VoxeetUXKit/Code/ViewControllers/ConferenceViewController.swift index 894c217..5828bfd 100644 --- a/VoxeetUXKit/Code/ViewControllers/ConferenceViewController.swift +++ b/VoxeetUXKit/Code/ViewControllers/ConferenceViewController.swift @@ -250,11 +250,14 @@ class ConferenceViewController: OverlayViewController { filePresentationContainerView.isHidden = true videoPresentationContainerView.isHidden = true - // Stop outgoing sounds if they were started. + // Stop all sounds if they were started. + // All AVPlayers have to be stopped before call to VoxeetSDK.shared.conference.leave(). outgoingSound?.stop() outgoingSound = nil joinedSound?.stop() joinedSound = nil + hangUpSound?.stop() + hangUpSound = nil default: break } } @@ -698,6 +701,7 @@ extension ConferenceViewController: VTUXActionBarViewControllerDelegate { // Hang up sound. hangUpSound?.play() + sleep(1) // Remove audio observer to desactivate speakerButton behaviour. conferenceStartTimer?.invalidate() From eaad1926fa0d7097628c2041c684975321ead208 Mon Sep 17 00:00:00 2001 From: ezugaj <87363315+ezugaj@users.noreply.github.com> Date: Fri, 1 Apr 2022 11:25:51 +0200 Subject: [PATCH 4/4] Release 1.7.0 (#51) * Release 1.7.0 --- .gitignore | 7 ++++++- Cartfile | 2 +- Cartfile.resolved | 2 -- Package.swift | 4 ++-- README.md | 2 +- Sample/Cartfile | 2 +- Sample/Cartfile.resolved | 2 +- VoxeetUXKit.podspec | 4 ++-- VoxeetUXKit.xcodeproj/project.pbxproj | 4 ++-- VoxeetUXKit/Other/settings.plist | 2 +- 10 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 Cartfile.resolved diff --git a/.gitignore b/.gitignore index 40b5cf0..f5f8feb 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,11 @@ playground.xcworkspace Carthage/ Sample/Carthage/ +Sample/Pods/ +Sample/VoxeetUXKitSampleCocoaPods.xcworkspace/ + +#SPM +.swiftpm/ # fastlane # @@ -61,4 +66,4 @@ Sample/Carthage/ fastlane/report.xml fastlane/Preview.html fastlane/screenshots -fastlane/test_output \ No newline at end of file +fastlane/test_output diff --git a/Cartfile b/Cartfile index 287bdac..41ecaae 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/v3.4.0-beta.1/VoxeetSDK.json" ~> 3.0 +binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/master/VoxeetSDK.json" ~> 3.0 github "onevcat/Kingfisher" ~> 7.0 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index de2c204..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,2 +0,0 @@ -binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/v3.4.0-beta.1/VoxeetSDK.json" "3.4.0" -github "onevcat/Kingfisher" "7.1.2" diff --git a/Package.swift b/Package.swift index 1543a31..caf90bc 100644 --- a/Package.swift +++ b/Package.swift @@ -14,12 +14,12 @@ let package = Package( .package( name: "VoxeetSDK", url: "https://github.com/voxeet/voxeet-sdk-ios.git", - from: "3.3.3" + .upToNextMajor(from: "3.0.0") ), .package( name: "Kingfisher", url: "https://github.com/onevcat/Kingfisher.git", - from: "7.1.0" + .upToNextMajor(from: "7.0.0") ) ], targets: diff --git a/README.md b/README.md index bb9b1de..bd8af1b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Before installing the Swift UXKit, ensure that you meet the minimum hardware and - **Operating systems**: iOS 12.0 and later - **Integrated development environment**: [Xcode 13+](https://developer.apple.com/xcode/) - **Language**: Swift 5.5.2 -- **Supported architectures**: armv7, arm64, i386, x86_64 +- **Supported architectures**: arm64, x86_64 ### Before you start diff --git a/Sample/Cartfile b/Sample/Cartfile index 5f1850c..63070cd 100644 --- a/Sample/Cartfile +++ b/Sample/Cartfile @@ -1 +1 @@ -github "voxeet/voxeet-uxkit-ios" "release/1.7.0-beta.1" +github "voxeet/voxeet-uxkit-ios" ~> 1.0 diff --git a/Sample/Cartfile.resolved b/Sample/Cartfile.resolved index de2c204..04f6aa7 100644 --- a/Sample/Cartfile.resolved +++ b/Sample/Cartfile.resolved @@ -1,2 +1,2 @@ -binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/v3.4.0-beta.1/VoxeetSDK.json" "3.4.0" +binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/master/VoxeetSDK.json" "3.4.0" github "onevcat/Kingfisher" "7.1.2" diff --git a/VoxeetUXKit.podspec b/VoxeetUXKit.podspec index 8660e60..a43e09e 100644 --- a/VoxeetUXKit.podspec +++ b/VoxeetUXKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "VoxeetUXKit" - spec.version = "1.7.0-beta.1" + spec.version = "1.7.0" spec.summary = "The Voxeet UXKit is a quick way of adding premium audio, video chats, and other supported options." spec.author = "Voxeet" spec.homepage = "https://dolby.io" @@ -12,7 +12,7 @@ Pod::Spec.new do |spec| spec.resources = "VoxeetUXKit/**/*.{mp3,storyboard,xcassets,lproj}" spec.framework = "UIKit" spec.dependency "VoxeetSDK", "~> 3.0" - spec.dependency "Kingfisher" + spec.dependency "Kingfisher", "~> 7.0" spec.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' # Disable bitcode to support dvclient.framework dependency. diff --git a/VoxeetUXKit.xcodeproj/project.pbxproj b/VoxeetUXKit.xcodeproj/project.pbxproj index b15f266..ec4d729 100644 --- a/VoxeetUXKit.xcodeproj/project.pbxproj +++ b/VoxeetUXKit.xcodeproj/project.pbxproj @@ -584,7 +584,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = B55NRA8BRW; DYLIB_COMPATIBILITY_VERSION = 1; @@ -618,7 +618,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = B55NRA8BRW; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/VoxeetUXKit/Other/settings.plist b/VoxeetUXKit/Other/settings.plist index 49e6b06..3199b25 100644 --- a/VoxeetUXKit/Other/settings.plist +++ b/VoxeetUXKit/Other/settings.plist @@ -21,7 +21,7 @@ NSPrincipalClass UXKitBuild - 1 + 0 UXKitVersion 1.7.0