From d190d66182aa47a6b90d67028794711e78401562 Mon Sep 17 00:00:00 2001 From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun, 13 Nov 2022 21:13:14 +0900 Subject: [PATCH] v1.0.23 --- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- LiveKitExample.xcodeproj/project.pbxproj | 18 ++++++++++-------- Shared/ExampleObservableRoom.swift | 4 ++-- Shared/Views/ScreenShareSourcePickerView.swift | 8 ++++---- iOS/BroadcastExt/LoggingOSLog.swift | 1 - 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/LiveKitExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LiveKitExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved index f01ffb9..296c6b2 100644 --- a/LiveKitExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LiveKitExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/webrtc-sdk/Specs.git", "state": { "branch": null, - "revision": "38ac06261e62f980652278c69b70284324c769e0", - "version": "104.5112.5" + "revision": "3490cea839a8526733be6ad3de4f0ae04e192b0f", + "version": "104.5112.6" } }, { diff --git a/LiveKitExample.xcodeproj/project.pbxproj b/LiveKitExample.xcodeproj/project.pbxproj index ca743e5..64e7904 100644 --- a/LiveKitExample.xcodeproj/project.pbxproj +++ b/LiveKitExample.xcodeproj/project.pbxproj @@ -95,6 +95,7 @@ 68B38543271E780700711D5F /* LiveKitExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveKitExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 68B38549271E780700711D5F /* LiveKitExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveKitExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 68B3854B271E780700711D5F /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = ""; }; + 68DEF27E2919EEFA00258494 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/ReplayKit.framework; sourceTree = DEVELOPER_DIR; }; 9E7835E62751A71500559DEC /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.0.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; D7AA477A285A0FFC00EB41AE /* SampleHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleHandler.swift; sourceTree = ""; }; D7FECD452860B42700D04D1C /* LoggingOSLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingOSLog.swift; sourceTree = ""; }; @@ -137,6 +138,7 @@ 681E3F47271FCB40007BB547 /* Frameworks */ = { isa = PBXGroup; children = ( + 68DEF27E2919EEFA00258494 /* ReplayKit.framework */, 9E7835E62751A71500559DEC /* CoreGraphics.framework */, 683F05F4273F96B20080C7AC /* ReplayKit.framework */, ); @@ -617,7 +619,7 @@ CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = 76TVFCUKK7; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = iOS/Info.plist; @@ -632,7 +634,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.21; + MARKETING_VERSION = 1.0.23; PRODUCT_BUNDLE_IDENTIFIER = io.livekit.example.SwiftSDK.1; PRODUCT_NAME = LiveKitExample; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -651,7 +653,7 @@ CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = 76TVFCUKK7; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = iOS/Info.plist; @@ -666,7 +668,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.21; + MARKETING_VERSION = 1.0.23; PRODUCT_BUNDLE_IDENTIFIER = io.livekit.example.SwiftSDK.1; PRODUCT_NAME = LiveKitExample; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -686,7 +688,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = 76TVFCUKK7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -699,7 +701,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0.22; + MARKETING_VERSION = 1.0.23; PRODUCT_BUNDLE_IDENTIFIER = io.livekit.example.SwiftSDK.1; PRODUCT_NAME = LiveKitExample; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -717,7 +719,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = 76TVFCUKK7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -730,7 +732,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0.22; + MARKETING_VERSION = 1.0.23; PRODUCT_BUNDLE_IDENTIFIER = io.livekit.example.SwiftSDK.1; PRODUCT_NAME = LiveKitExample; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Shared/ExampleObservableRoom.swift b/Shared/ExampleObservableRoom.swift index 7c922b6..4190943 100644 --- a/Shared/ExampleObservableRoom.swift +++ b/Shared/ExampleObservableRoom.swift @@ -125,9 +125,9 @@ class ExampleObservableRoom: ObservableRoom { } else { guard let source = screenShareSource else { return } - + print("selected source: \(source)") - + DispatchQueue.main.async { self.screenShareTrackState = .busy(isPublishing: true) } diff --git a/Shared/Views/ScreenShareSourcePickerView.swift b/Shared/Views/ScreenShareSourcePickerView.swift index 5985126..5812afc 100644 --- a/Shared/Views/ScreenShareSourcePickerView.swift +++ b/Shared/Views/ScreenShareSourcePickerView.swift @@ -36,15 +36,15 @@ class ScreenShareSourcePickerCtrl: ObservableObject { assert(false, "error: \(error)") } } - + init() { restartTracks() } deinit { - + print("\(type(of: self)) deinit") - + _ = all(tracks.map { $0.stop() }).catch { error in // should not happen assert(false, "error: \(error)") @@ -97,7 +97,7 @@ struct ScreenShareSourcePickerView: View { let source = capturer.captureSource else { return } onPickScreenShareSource?(source) } - + if let capturer = track.capturer as? MacOSScreenCapturer, let source = capturer.captureSource as? MacOSWindow, let appName = source.owningApplication?.applicationName { diff --git a/iOS/BroadcastExt/LoggingOSLog.swift b/iOS/BroadcastExt/LoggingOSLog.swift index ece67c0..fa3f34f 100644 --- a/iOS/BroadcastExt/LoggingOSLog.swift +++ b/iOS/BroadcastExt/LoggingOSLog.swift @@ -1,6 +1,5 @@ import Foundation import Logging -import struct Logging.Logger import os public struct LoggingOSLog: LogHandler {