From 9a762002c9a051f0025f08313b8bd277c16ea540 Mon Sep 17 00:00:00 2001 From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:48:44 +0900 Subject: [PATCH] Update for SDK v2.0.14 and lower iOS ver requirement --- .../xcshareddata/swiftpm/Package.resolved | 12 +++--- .../project.pbxproj | 30 ++++++++++--- .../xcshareddata/swiftpm/Package.resolved | 43 +++++++++++++++++-- Shared/Sheets/OptionsSheet.swift | 2 +- Shared/Sheets/UsersSheet.swift | 2 +- Shared/Views/MessageBarView.swift | 2 +- Shared/Views/PublisherVideoView.swift | 2 +- Shared/Views/StyledButton.swift | 7 ++- Shared/Views/SwitchCameraButton.swift | 34 +++++++++------ 9 files changed, 98 insertions(+), 36 deletions(-) diff --git a/LiveKitLivestreamExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LiveKitLivestreamExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved index fbe2fb8..ab6609b 100644 --- a/LiveKitLivestreamExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LiveKitLivestreamExample-dev.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/vapor/jwt-kit.git", "state" : { - "revision" : "e05513b5aec24f88012b6e3034115b6bc915356a", - "version" : "4.13.2" + "revision" : "c2595b9ad7f512d7f334830b4df1fed6e917946a", + "version" : "4.13.4" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8", - "version" : "1.25.2" + "revision" : "edb6ed4919f7756157fe02f2552b7e3850a538e5", + "version" : "1.28.1" } }, { @@ -104,8 +104,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/livekit/webrtc-xcframework.git", "state" : { - "revision" : "56e5119f00daa2e42e10670d29ae2edbff6be961", - "version" : "114.5735.13" + "revision" : "9b8d54b203247a84d5f2a9f682d75f4129d0b09b", + "version" : "125.6422.7" } } ], diff --git a/LiveKitLivestreamExample.xcodeproj/project.pbxproj b/LiveKitLivestreamExample.xcodeproj/project.pbxproj index 42a841e..a36f3cb 100644 --- a/LiveKitLivestreamExample.xcodeproj/project.pbxproj +++ b/LiveKitLivestreamExample.xcodeproj/project.pbxproj @@ -339,6 +339,8 @@ 682937662A59498800BC8CD7 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */, 68D594E22A78B1C400ABBD2C /* XCRemoteSwiftPackageReference "AlertToast" */, 68D594E62A78C67500ABBD2C /* XCRemoteSwiftPackageReference "Nuke" */, + 68B3C3782C897990008338EC /* XCRemoteSwiftPackageReference "client-sdk-swift" */, + 68B3C3792C8979B6008338EC /* XCRemoteSwiftPackageReference "client-components-swift" */, ); productRefGroup = 683865A22A29F9A3005D0947 /* Products */; projectDirPath = ""; @@ -546,7 +548,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 2024090501; DEVELOPMENT_TEAM = 76TVFCUKK7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -565,11 +567,11 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 1.0.7; + MARKETING_VERSION = 2.0.14; PRODUCT_BUNDLE_IDENTIFIER = io.livekit.example.livestream; PRODUCT_NAME = "LK Live"; SDKROOT = auto; @@ -590,7 +592,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 2024090501; DEVELOPMENT_TEAM = 76TVFCUKK7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -609,11 +611,11 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 1.0.7; + MARKETING_VERSION = 2.0.14; PRODUCT_BUNDLE_IDENTIFIER = io.livekit.example.livestream; PRODUCT_NAME = "LK Live"; SDKROOT = auto; @@ -736,6 +738,22 @@ minimumVersion = 4.0.0; }; }; + 68B3C3782C897990008338EC /* XCRemoteSwiftPackageReference "client-sdk-swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/livekit/client-sdk-swift"; + requirement = { + kind = exactVersion; + version = 2.0.14; + }; + }; + 68B3C3792C8979B6008338EC /* XCRemoteSwiftPackageReference "client-components-swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/livekit/client-components-swift"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.0.1; + }; + }; 68D594E22A78B1C400ABBD2C /* XCRemoteSwiftPackageReference "AlertToast" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/elai950/AlertToast"; diff --git a/LiveKitLivestreamExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LiveKitLivestreamExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1936dee..a58c03e 100644 --- a/LiveKitLivestreamExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LiveKitLivestreamExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "fb2ee28f8532e1f40245d54d45d0f70907f12918f6e920c3b5d7d2afa4d0bef5", "pins" : [ { "identity" : "alerttoast", @@ -9,6 +10,24 @@ "version" : "1.3.9" } }, + { + "identity" : "client-components-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/livekit/client-components-swift", + "state" : { + "revision" : "82fc74016db420393f425f54af12b5467f668e1f", + "version" : "0.0.1" + } + }, + { + "identity" : "client-sdk-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/livekit/client-sdk-swift", + "state" : { + "revision" : "0c6b9686235a56ea1961746ac750c524836be5ee", + "version" : "2.0.14" + } + }, { "identity" : "nuke", "kind" : "remoteSourceControl", @@ -32,8 +51,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log", "state" : { - "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed", - "version" : "1.5.3" + "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537", + "version" : "1.6.1" + } + }, + { + "identity" : "swift-protobuf", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-protobuf.git", + "state" : { + "revision" : "edb6ed4919f7756157fe02f2552b7e3850a538e5", + "version" : "1.28.1" } }, { @@ -53,7 +81,16 @@ "revision" : "3042f0cf4b9f0d5b0bb08ad17f742a43bc4fdfc5", "version" : "2.8.0" } + }, + { + "identity" : "webrtc-xcframework", + "kind" : "remoteSourceControl", + "location" : "https://github.com/livekit/webrtc-xcframework.git", + "state" : { + "revision" : "9b8d54b203247a84d5f2a9f682d75f4129d0b09b", + "version" : "125.6422.7" + } } ], - "version" : 2 + "version" : 3 } diff --git a/Shared/Sheets/OptionsSheet.swift b/Shared/Sheets/OptionsSheet.swift index b12e55c..37853b6 100644 --- a/Shared/Sheets/OptionsSheet.swift +++ b/Shared/Sheets/OptionsSheet.swift @@ -67,7 +67,7 @@ struct OptionsSheet: View { } .backport.presentationDetents([.medium]) .backport.presentationDragIndicator(.visible) - .presentationBackground(.black) + // .presentationBackground(.black) .padding() .frame(minWidth: 300) .toast(isPresenting: $showCopiedToast) { diff --git a/Shared/Sheets/UsersSheet.swift b/Shared/Sheets/UsersSheet.swift index 3f7f09e..1c492e4 100644 --- a/Shared/Sheets/UsersSheet.swift +++ b/Shared/Sheets/UsersSheet.swift @@ -177,7 +177,7 @@ struct UsersSheet: View { } .backport.presentationDetents([.medium, .large]) .backport.presentationDragIndicator(.visible) - .presentationBackground(.black) + // .presentationBackground(.black) .padding() .frame(minWidth: 370) } diff --git a/Shared/Views/MessageBarView.swift b/Shared/Views/MessageBarView.swift index baf0e77..0925fdc 100644 --- a/Shared/Views/MessageBarView.swift +++ b/Shared/Views/MessageBarView.swift @@ -28,7 +28,7 @@ struct MessageBarView: View { var body: some View { HStack { - TextField("", text: $roomCtx.message, axis: .vertical) + TextField("", text: $roomCtx.message) .focused($focusFields, equals: .message) .lineLimit(5) .font(.system(size: 12)) diff --git a/Shared/Views/PublisherVideoView.swift b/Shared/Views/PublisherVideoView.swift index 0119dd0..3028d9e 100644 --- a/Shared/Views/PublisherVideoView.swift +++ b/Shared/Views/PublisherVideoView.swift @@ -52,7 +52,7 @@ struct PublisherVideoView: View { struct SubscriberVideoView: View { @EnvironmentObject var room: Room - @EnvironmentObject var ui: UIPreference + @EnvironmentObject var ui: UIOptions var body: some View { ZStack(alignment: .topLeading) { diff --git a/Shared/Views/StyledButton.swift b/Shared/Views/StyledButton.swift index 96e192f..8cfded3 100644 --- a/Shared/Views/StyledButton.swift +++ b/Shared/Views/StyledButton.swift @@ -45,8 +45,8 @@ struct StyledButton