Skip to content

Commit

Permalink
Prepare release 1.7.0 beta.2 with VoxeetSDK 3.4.0-beta.2 (voxeet#28)
Browse files Browse the repository at this point in the history
* Fixed an issue where a participant cannot connect to a conference using a push notification after reopening an application.

* Bump VoxeetSDK to v3.4.0-beta.2 and UXKit to 1.7.0-beta.2
  • Loading branch information
yganu authored Jan 25, 2022
1 parent 6fee57a commit 97d99fb
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -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/3.4.0-beta.2/VoxeetSDK.json" ~> 3.0
github "onevcat/Kingfisher" ~> 7.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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/3.4.0-beta.2/VoxeetSDK.json" "3.4.0"
github "onevcat/Kingfisher" "7.1.2"
2 changes: 1 addition & 1 deletion Sample/Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "voxeet/voxeet-uxkit-ios" "release/1.7.0-beta.1"
github "voxeet/voxeet-uxkit-ios" "release/1.7.0-beta.2"
2 changes: 1 addition & 1 deletion Sample/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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/3.4.0-beta.2/VoxeetSDK.json" "3.4.0"
github "onevcat/Kingfisher" "7.1.2"
2 changes: 1 addition & 1 deletion VoxeetUXKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "VoxeetUXKit"
spec.version = "1.7.0-beta.1"
spec.version = "1.7.0-beta.2"
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"
Expand Down
8 changes: 6 additions & 2 deletions VoxeetUXKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
5B8F7FE1279F2A03004A2E58 /* UIApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B8F7FE0279F2A03004A2E58 /* UIApplicationExtension.swift */; };
8C63CF5427721BDB007180B9 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C63CF4F27721BDB007180B9 /* WebRTC.xcframework */; };
8C63CF5527721BDB007180B9 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8C63CF4F27721BDB007180B9 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8C63CF5627721BDB007180B9 /* VoxeetSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C63CF5027721BDB007180B9 /* VoxeetSDK.xcframework */; };
Expand Down Expand Up @@ -66,6 +67,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
5B8F7FE0279F2A03004A2E58 /* UIApplicationExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIApplicationExtension.swift; sourceTree = "<group>"; };
8C63CF4F27721BDB007180B9 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = Carthage/Build/WebRTC.xcframework; sourceTree = "<group>"; };
8C63CF5027721BDB007180B9 /* VoxeetSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VoxeetSDK.xcframework; path = Carthage/Build/VoxeetSDK.xcframework; sourceTree = "<group>"; };
8C63CF5127721BDB007180B9 /* dvclient.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = dvclient.xcframework; path = Carthage/Build/dvclient.xcframework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -179,6 +181,7 @@
CC2B290E1E548C0300E3EB57 /* Extensions */ = {
isa = PBXGroup;
children = (
5B8F7FE0279F2A03004A2E58 /* UIApplicationExtension.swift */,
CCEEEEF01F0A9C52000F4D61 /* Print+Extension.swift */,
FA1A98AC22F4666500ECD4E6 /* UIButton+Extension.swift */,
);
Expand Down Expand Up @@ -431,6 +434,7 @@
FAADC93122F87C6700F59938 /* VTUXConferenceControllerConfiguration.swift in Sources */,
FAADC93922F8841100F59938 /* VTUXConferenceController.swift in Sources */,
FA234A8822B2759500C3216C /* VTUXSpeakerViewController.swift in Sources */,
5B8F7FE1279F2A03004A2E58 /* UIApplicationExtension.swift in Sources */,
FAADC93722F87CD700F59938 /* VTUXParticipantsConfiguration.swift in Sources */,
FA867E9122F9D46300D15DC8 /* VTUXOverlayConfiguration.swift in Sources */,
FAF523822304116B00421A84 /* VTUXLocalized.swift in Sources */,
Expand Down Expand Up @@ -596,7 +600,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = B55NRA8BRW;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -630,7 +634,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = B55NRA8BRW;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ extension VTUXConferenceController {
if let vc = viewController {
vc.view.accessibilityIdentifier = "ConferenceView"
vc.view.translatesAutoresizingMaskIntoConstraints = false
guard let window = UIApplication.shared.keyWindow else { return }
guard let window = UIApplication.keyWindow else { return }
window.addSubview(vc.view)
}

Expand Down
28 changes: 28 additions & 0 deletions VoxeetUXKit/Code/Utilities/Extensions/UIApplicationExtension.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// UIApplicationExtension.swift
// VoxeetUXKit
//
// Created by Yuriy Ganushevich on 20/01/2022.
// Copyright © 2022 Voxeet. All rights reserved.
//

import Foundation

extension UIApplication {

static var keyWindow: UIWindow? {
if #available(iOS 13, *) {
return UIApplication
.shared
.connectedScenes
.compactMap { $0 as? UIWindowScene }
.flatMap { $0.windows }
.first { $0.isKeyWindow }
} else {
return UIApplication
.shared
.windows
.first { $0.isKeyWindow }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ extension VTUXParticipantsViewController: UICollectionViewDelegate {
extension VTUXParticipantsViewController: UICollectionViewDelegateFlowLayout {
public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
let flowLayout = collectionViewLayout as! UICollectionViewFlowLayout
let window = UIApplication.shared.keyWindow
let window = UIApplication.keyWindow
let safeArea: UIEdgeInsets
if #available(iOS 11.0, *) {
safeArea = window?.safeAreaInsets ?? .zero
Expand Down
2 changes: 1 addition & 1 deletion VoxeetUXKit/Other/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>NSPrincipalClass</key>
<string></string>
<key>UXKitBuild</key>
<string>1</string>
<string>2</string>
<key>UXKitVersion</key>
<string>1.7.0</string>
</dict>
Expand Down

0 comments on commit 97d99fb

Please sign in to comment.