diff --git a/.github/workflows/data-channel-sample.yml b/.github/workflows/data-channel-sample.yml index 75d2d52..ba312c6 100644 --- a/.github/workflows/data-channel-sample.yml +++ b/.github/workflows/data-channel-sample.yml @@ -15,10 +15,10 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: - XCODE: /Applications/Xcode_14.0.app - XCODE_SDK: iphoneos16.0 + XCODE: /Applications/Xcode_14.3.1.app + XCODE_SDK: iphoneos16.4 WORKSPACE: DataChannelSample SCHEME: DataChannelSample steps: @@ -58,6 +58,7 @@ jobs: CODE_SIGNING_ALLOWED=NO \ CODE_SIGN_IDENTITY= \ PROVISIONING_PROFILE= - - name: Check uncommitted unformatted code - run: | - ../lint-format.sh \ No newline at end of file + # SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする + #- name: Check uncommitted unformatted code + # run: | + # ./lint-format.sh \ No newline at end of file diff --git a/.github/workflows/deco-streaming-sample.yml b/.github/workflows/deco-streaming-sample.yml index 4cf1adb..9520043 100644 --- a/.github/workflows/deco-streaming-sample.yml +++ b/.github/workflows/deco-streaming-sample.yml @@ -15,10 +15,10 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: - XCODE: /Applications/Xcode_14.0.app - XCODE_SDK: iphoneos16.0 + XCODE: /Applications/Xcode_14.3.1.app + XCODE_SDK: iphoneos16.4 WORKSPACE: DecoStreamingSample SCHEME: DecoStreamingSample steps: @@ -58,6 +58,7 @@ jobs: CODE_SIGNING_ALLOWED=NO \ CODE_SIGN_IDENTITY= \ PROVISIONING_PROFILE= - - name: Check uncommitted unformatted code - run: | - ../lint-format.sh \ No newline at end of file + # SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする + #- name: Check uncommitted unformatted code + # run: | + # ./lint-format.sh \ No newline at end of file diff --git a/.github/workflows/screencast-sample.yml b/.github/workflows/screencast-sample.yml index fd974e9..32167ef 100644 --- a/.github/workflows/screencast-sample.yml +++ b/.github/workflows/screencast-sample.yml @@ -15,10 +15,10 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: - XCODE: /Applications/Xcode_14.0.app - XCODE_SDK: iphoneos16.0 + XCODE: /Applications/Xcode_14.3.1.app + XCODE_SDK: iphoneos16.4 WORKSPACE: ScreenCastSample SCHEME: ScreenCastSample steps: @@ -58,6 +58,7 @@ jobs: CODE_SIGNING_ALLOWED=NO \ CODE_SIGN_IDENTITY= \ PROVISIONING_PROFILE= - - name: Check uncommitted unformatted code - run: | - ../lint-format.sh \ No newline at end of file + # SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする + #- name: Check uncommitted unformatted code + # run: | + # ./lint-format.sh \ No newline at end of file diff --git a/.github/workflows/simulcast-sample.yml b/.github/workflows/simulcast-sample.yml index ca0f422..a13f5d1 100644 --- a/.github/workflows/simulcast-sample.yml +++ b/.github/workflows/simulcast-sample.yml @@ -15,10 +15,10 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: - XCODE: /Applications/Xcode_14.0.app - XCODE_SDK: iphoneos16.0 + XCODE: /Applications/Xcode_14.3.1.app + XCODE_SDK: iphoneos16.4 WORKSPACE: SimulcastSample SCHEME: SimulcastSample steps: @@ -58,6 +58,7 @@ jobs: CODE_SIGNING_ALLOWED=NO \ CODE_SIGN_IDENTITY= \ PROVISIONING_PROFILE= - - name: Check uncommitted unformatted code - run: | - ../lint-format.sh \ No newline at end of file + # SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする + #- name: Check uncommitted unformatted code + # run: | + # ./lint-format.sh \ No newline at end of file diff --git a/.github/workflows/spotlight-sample.yml b/.github/workflows/spotlight-sample.yml index 18d7ef6..4e6f487 100644 --- a/.github/workflows/spotlight-sample.yml +++ b/.github/workflows/spotlight-sample.yml @@ -15,10 +15,10 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: - XCODE: /Applications/Xcode_14.0.app - XCODE_SDK: iphoneos16.0 + XCODE: /Applications/Xcode_14.3.1.app + XCODE_SDK: iphoneos16.4 WORKSPACE: SpotlightSample SCHEME: SpotlightSample steps: @@ -58,6 +58,7 @@ jobs: CODE_SIGNING_ALLOWED=NO \ CODE_SIGN_IDENTITY= \ PROVISIONING_PROFILE= - - name: Check uncommitted unformatted code - run: | - ../lint-format.sh \ No newline at end of file + # SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする + #- name: Check uncommitted unformatted code + # run: | + # ./lint-format.sh \ No newline at end of file diff --git a/.github/workflows/video-chat-sample.yml b/.github/workflows/video-chat-sample.yml index 0d7449e..2e10231 100644 --- a/.github/workflows/video-chat-sample.yml +++ b/.github/workflows/video-chat-sample.yml @@ -15,10 +15,10 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: - XCODE: /Applications/Xcode_14.0.app - XCODE_SDK: iphoneos16.0 + XCODE: /Applications/Xcode_14.3.1.app + XCODE_SDK: iphoneos16.4 WORKSPACE: VideoChatSample SCHEME: VideoChatSample steps: @@ -58,6 +58,7 @@ jobs: CODE_SIGNING_ALLOWED=NO \ CODE_SIGN_IDENTITY= \ PROVISIONING_PROFILE= - - name: Check uncommitted unformatted code - run: | - ../lint-format.sh \ No newline at end of file + # SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする + #- name: Check uncommitted unformatted code + # run: | + # ./lint-format.sh \ No newline at end of file diff --git a/CHANGES.md b/CHANGES.md index d1310f0..d7ac4de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,15 @@ ## develop +## sora-ios-sdk-2023.3.0 + +- [UPDATE] SwiftLint, SwiftFormat/CLI を一時的にコメントアウトする + - SwiftLint, SwiftFormat/CLI が Swift Swift 5.9 に対応できていないため + - 対応が完了したら戻す + - @miosakuma +- [FIX] VideoChatSample で signalingConnectMetadata が設定できない不具合を修正 + - @miosakuma + ## sora-ios-sdk-2023.2.0 - [ADD] DataChannelSample の映像コーデックに AV1 を追加する @@ -25,7 +34,7 @@ - @miosakuma - [ADD] VideoChatSample に映像コーデックプロファイル設定を追加する - @miosakuma -- [CHANGE] システム条件を変更する +- [UPDATE] システム条件を変更する - macOS 13.4.1 以降 - Xcode 14.3.1 - Swift 5.8.1 @@ -38,7 +47,7 @@ ## sora-ios-sdk-2023.1.0 -- [CHANGE] システム条件を変更する +- [UPDATE] システム条件を変更する - macOS 13.3 以降 - Xcode 14.3 - Swift 5.8 diff --git a/DataChannelSample/Podfile b/DataChannelSample/Podfile index 99eae47..e6e935b 100644 --- a/DataChannelSample/Podfile +++ b/DataChannelSample/Podfile @@ -5,7 +5,8 @@ platform :ios, '13.0' target 'DataChannelSample' do use_frameworks! - pod 'Sora', '2023.2.0' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' + pod 'Sora', '2023.3.0' +# SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする +# pod 'SwiftLint' +# pod 'SwiftFormat/CLI' end diff --git a/DecoStreamingSample/Podfile b/DecoStreamingSample/Podfile index ddd2d45..16ca7b3 100644 --- a/DecoStreamingSample/Podfile +++ b/DecoStreamingSample/Podfile @@ -5,8 +5,9 @@ platform :ios, '13.0' target 'DecoStreamingSample' do use_frameworks! - pod 'Sora', '2023.2.0' + pod 'Sora', '2023.3.0' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' +# SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする +# pod 'SwiftLint' +# pod 'SwiftFormat/CLI' end diff --git a/ScreenCastSample/Podfile b/ScreenCastSample/Podfile index 84604d5..5df9958 100644 --- a/ScreenCastSample/Podfile +++ b/ScreenCastSample/Podfile @@ -5,8 +5,9 @@ platform :ios, '13.0' target 'ScreenCastSample' do use_frameworks! - pod 'Sora', '2023.2.0' + pod 'Sora', '2023.3.0' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' +# SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする +# pod 'SwiftLint' +# pod 'SwiftFormat/CLI' end diff --git a/SimulcastSample/Podfile b/SimulcastSample/Podfile index 32c5489..6d62a68 100644 --- a/SimulcastSample/Podfile +++ b/SimulcastSample/Podfile @@ -5,8 +5,9 @@ platform :ios, '13.0' target 'SimulcastSample' do use_frameworks! - pod 'Sora', '2023.2.0' + pod 'Sora', '2023.3.0' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' +# SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする +# pod 'SwiftLint' +# pod 'SwiftFormat/CLI' end diff --git a/SpotlightSample/Podfile b/SpotlightSample/Podfile index 9414051..10ae6f3 100644 --- a/SpotlightSample/Podfile +++ b/SpotlightSample/Podfile @@ -5,8 +5,9 @@ platform :ios, '13.0' target 'SpotlightSample' do use_frameworks! - pod 'Sora', '2023.2.0' + pod 'Sora', '2023.3.0' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' +# SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする +# pod 'SwiftLint' +# pod 'SwiftFormat/CLI' end diff --git a/VideoChatSample/Podfile b/VideoChatSample/Podfile index a161347..c02e6b2 100644 --- a/VideoChatSample/Podfile +++ b/VideoChatSample/Podfile @@ -5,8 +5,9 @@ platform :ios, '13.0' target 'VideoChatSample' do use_frameworks! - pod 'Sora', '2023.2.0' + pod 'Sora', '2023.3.0' - pod 'SwiftLint' - pod 'SwiftFormat/CLI' +# SwiftLint, SwiftFormat/CLI が Swift 5.8 に対応していないため一時的にコメントアウトする +# pod 'SwiftLint' +# pod 'SwiftFormat/CLI' end diff --git a/VideoChatSample/VideoChatSample/Classes/ConfigViewController.swift b/VideoChatSample/VideoChatSample/Classes/ConfigViewController.swift index 9245c27..51d40a0 100644 --- a/VideoChatSample/VideoChatSample/Classes/ConfigViewController.swift +++ b/VideoChatSample/VideoChatSample/Classes/ConfigViewController.swift @@ -117,6 +117,8 @@ class ConfigViewController: UITableViewController { let videoH264Params = h264ProfileLevelId != nil ? ["profile_level_id": h264ProfileLevelId!] : nil configuration.videoH264Params = videoH264Params + + configuration.signalingConnectMetadata = Environment.signalingConnectMetadata // 入力された設定を元にSoraへ接続を行います。 // ビデオチャットアプリでは複数のユーザーが同時に配信を行う必要があるため、