Merge pull request #52 from voxeet/release/1.7.0

Release/1.7.0
voxeet · Apr 1, 2022 · 8f5760d · 8f5760d
2 parents 4cf2303 + eaad192
commit 8f5760d
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 19 deletions.
diff --git 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
+fastlane/test_output
diff --git 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/master/VoxeetSDK.json" ~> 3.0
 github "onevcat/Kingfisher" ~> 7.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git 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
@@ -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
@@ -1 +1 @@
-github "voxeet/voxeet-uxkit-ios" "release/1.6.5"
+github "voxeet/voxeet-uxkit-ios" ~> 1.0
diff --git 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/master/VoxeetSDK.json" "3.4.0"
 github "onevcat/Kingfisher" "7.1.2"
diff --git 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"
   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,15 +12,11 @@ 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"
 
-  # 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

diff --git a/VoxeetUXKit.xcodeproj/project.pbxproj b/VoxeetUXKit.xcodeproj/project.pbxproj
@@ -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 = "";
@@ -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/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()

diff --git a/VoxeetUXKit/Other/settings.plist b/VoxeetUXKit/Other/settings.plist
@@ -23,6 +23,6 @@
 	<key>UXKitBuild</key>
 	<string>0</string>
 	<key>UXKitVersion</key>
-	<string>1.6.5</string>
+	<string>1.7.0</string>
 </dict>
 </plist>