Merge branch 'release/2023.3.0'

.github/renovate.json

@@ -9,5 +9,6 @@
     "group:recommended",
     "group:allNonMajor",
     "schedule:weekly"
-  ]
-}
+  ],
+  "dependencyDashboard": false
+}

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       XCODE: /Applications/Xcode_14.3.1.app
       XCODE_SDK: iphoneos16.4
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Select Xcode Version
       run: sudo xcode-select -s '${{ env.XCODE }}/Contents/Developer'
     - name: Show Xcode Version
@@ -58,7 +58,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1.1.4

.jazzy.yaml

@@ -8,7 +8,7 @@ theme: apple
 min_acl: public
 sdk: iphoneos
 module: Sora
-module_version: 2023.2.0
+module_version: 2023.3.0
 swift_version: 5.8.1
 xcodebuild_arguments:
     - -parallelizeTargets

CHANGES.md

@@ -11,6 +11,27 @@
 
 ## develop
 
+## 2023.3.0
+
+- [CHANGE] `@available(*, unavailable)` は廃止になるため削除する
+    - Swift 5.9 以降 `@available(*, unavailable)` が禁止された
+    - Sora iOS SDK では廃止となったプロパティに対して `@available(*, unavailable)` を付与していたが、削除した
+    - @torikizi
+- [CHANGE] `@available(*, deprecated, ... )` としていた非推奨項目を削除する
+    - 非推奨であった項目について削除に移行する
+    - 移行方法については https://sora-ios-sdk.shiguredo.jp/ の移行ドキュメントに記載されている
+    - @torikizi
+- [CHANGE] 廃止された `onConnectHandler` を `onConnect` に置き換える
+    - すでに廃止済みの `onConnectHandler` が残っていたので、`onConnect` に置き換えた
+    - `PeerChannel.swift` と `SignalingChannel.swift` 以外はすでに `onConnect` に置き換えていた
+    - @torikizi
+- [UPDATE] WebRTC 116.5845.6.1 に上げる
+    - @miosakuma
+- [FIX] `MediaChannel` の `connectionCount`, `publisherCount`, `subscriberCount` に値が設定されない不具合を修正する
+    - Sora のシグナリングメッセージから channel_upstream_connections, channel_downstream_connections が廃止された契機で値が設定されなくなっていた
+    - Sora のシグナリングメッセージ、channel_sendrecv_connections, channel_sendonly_connections, channel_recvonly_connections, channel_connections を元に値を設定するよう修正
+    - @miosakuma
+
 ## 2023.2.0
 
 - [UPDATE] システム条件を変更する
@@ -31,7 +52,7 @@
 - [ADD] サイマルキャストを VP9 / AV1 に対応する
     - @szktty
 
-## 2023.2.0
+## 2023.1.0
 
 - [UPDATE] WebRTC 112.5615.1.0 に上げる
     - @miosakuma

Package.swift

@@ -3,7 +3,7 @@
 import Foundation
 import PackageDescription
 
-let file = "WebRTC-115.5790.7.0/WebRTC.xcframework.zip"
+let file = "WebRTC-116.5845.6.1/WebRTC.xcframework.zip"
 
 let package = Package(
     name: "Sora",
@@ -16,7 +16,7 @@ let package = Package(
         .binaryTarget(
             name: "WebRTC",
             url: "https://github.com/shiguredo/sora-ios-sdk-specs/releases/download/\(file)",
-            checksum: "1a852818dc15280f3ded5d16cc52fb30c91515c9f08b26d2dcaea68a7de414fc"
+            checksum: "5902e61f79e941830a52827db8bc408e7c9d2e5f2e0804e3664b8dd35fd6148c"
         ),
         .target(
             name: "Sora",

Podfile

@@ -5,5 +5,5 @@ platform :ios, '13.0'
 
 target 'Sora' do
   use_frameworks!
-  pod 'WebRTC', '115.5790.7.0'
+  pod 'WebRTC', '116.5845.6.1'
 end

Podfile.dev

@@ -5,7 +5,7 @@ platform :ios, '13.0'
 
 target 'Sora' do
   use_frameworks!
-  pod 'WebRTC', '115.5790.7.0'
+  pod 'WebRTC', '116.5845.6.1'
   pod 'SwiftLint', '0.51.0'
   pod 'SwiftFormat/CLI', '0.51.6'
 end

README.md

@@ -1,6 +1,6 @@
 # Sora iOS SDK
 
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-115.5790-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5790)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-116.5845-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5845)
 [![GitHub tag](https://img.shields.io/github/tag/shiguredo/sora-ios-sdk.svg)](https://github.com/shiguredo/sora-ios-sdk)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
@@ -37,6 +37,18 @@ Xcode と Swift のバージョンによっては、 CocoaPods で取得でき
 
 [Sora iOS SDK ドキュメント — Sora iOS SDK](https://sora-ios-sdk.shiguredo.jp/)
 
+## 有償での優先実装が可能な機能一覧
+
+**詳細は Discord またはメールにてお問い合わせください**
+
+- オープンソースでの公開が前提
+- 可能であれば企業名の公開
+    - 公開が難しい場合は `企業名非公開` と書かせていただきます
+
+### 機能
+
+- 音声出力先変更機能
+
 ## ライセンス
 
 Apache License 2.0

Sora.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sora"
-  s.version      = "2023.2.0"
+  s.version      = "2023.3.0"
   s.summary      = "Sora iOS SDK"
   s.description  = <<-DESC
                    A library to develop Sora client applications.
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   }
   s.source_files  = "Sora/**/*.swift"
   s.resources = ['Sora/*.xib']
-  s.dependency "WebRTC", '115.5790.7.0'
+  s.dependency "WebRTC", '116.5845.6.1'
   s.pod_target_xcconfig = {
     'ARCHS' => 'arm64',
     'ARCHS[config=Debug]' => '$(ARCHS_STANDARD)'

Sora.xcodeproj/project.pbxproj

@@ -33,7 +33,6 @@
 		9174A8951F73F90B00D586C4 /* AudioCodec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9174A8941F73F90B00D586C4 /* AudioCodec.swift */; };
 		9174A8971F73F93B00D586C4 /* ICETransportPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9174A8961F73F93B00D586C4 /* ICETransportPolicy.swift */; };
 		9174A8991F73F9A200D586C4 /* TLSSecurityPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9174A8981F73F9A200D586C4 /* TLSSecurityPolicy.swift */; };
-		9174A89B1F73F9EE00D586C4 /* CameraPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9174A89A1F73F9EE00D586C4 /* CameraPosition.swift */; };
 		91756E211F90A87500B70C53 /* ConnectionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91756E201F90A87500B70C53 /* ConnectionState.swift */; };
 		91756E221F90ADE900B70C53 /* PeerChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91A19B8B1F19366B00A76852 /* PeerChannel.swift */; };
 		9177FF9C1F2E2D1600B4FA1A /* VideoCapturer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9177FF9B1F2E2D1600B4FA1A /* VideoCapturer.swift */; };
@@ -49,7 +48,6 @@
 		91FA6F211D93CA9800D38DB4 /* VideoFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */; };
 		91FD95751DCA06F700047BA9 /* RTC+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91FD95741DCA06F700047BA9 /* RTC+Description.swift */; };
 		AD7227122716B5F100001A23 /* DataChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD7227112716B5F100001A23 /* DataChannel.swift */; };
-		C5D3C7421F7CEB18004660F5 /* VideoCapturerDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D3C7411F7CEB18004660F5 /* VideoCapturerDevice.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -101,7 +99,6 @@
 		9174A8941F73F90B00D586C4 /* AudioCodec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioCodec.swift; sourceTree = "<group>"; };
 		9174A8961F73F93B00D586C4 /* ICETransportPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICETransportPolicy.swift; sourceTree = "<group>"; };
 		9174A8981F73F9A200D586C4 /* TLSSecurityPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TLSSecurityPolicy.swift; sourceTree = "<group>"; };
-		9174A89A1F73F9EE00D586C4 /* CameraPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPosition.swift; sourceTree = "<group>"; };
 		91756E201F90A87500B70C53 /* ConnectionState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionState.swift; sourceTree = "<group>"; };
 		9177FF9B1F2E2D1600B4FA1A /* VideoCapturer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoCapturer.swift; sourceTree = "<group>"; };
 		918A38F71F30F49500D047BA /* ICEServerInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICEServerInfo.swift; sourceTree = "<group>"; };
@@ -120,7 +117,6 @@
 		91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFrame.swift; sourceTree = "<group>"; };
 		91FD95741DCA06F700047BA9 /* RTC+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RTC+Description.swift"; sourceTree = "<group>"; };
 		AD7227112716B5F100001A23 /* DataChannel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataChannel.swift; sourceTree = "<group>"; };
-		C5D3C7411F7CEB18004660F5 /* VideoCapturerDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCapturerDevice.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -185,7 +181,6 @@
 				9174A88E1F7395CA00D586C4 /* AspectRatio.swift */,
 				9174A8941F73F90B00D586C4 /* AudioCodec.swift */,
 				910444CE253EC6F400EA06BE /* AudioMode.swift */,
-				9174A89A1F73F9EE00D586C4 /* CameraPosition.swift */,
 				915CEC8F1F821A90006E45E2 /* CameraVideoCapturer.swift */,
 				9173595D1F2CCEBF00806F8B /* Configuration.swift */,
 				91756E201F90A87500B70C53 /* ConnectionState.swift */,
@@ -212,7 +207,6 @@
 				3591D8EF27032233000AD514 /* SoraDispatcher.swift */,
 				9145A58F1F0CB093002D6EC6 /* Utilities.swift */,
 				9177FF9B1F2E2D1600B4FA1A /* VideoCapturer.swift */,
-				C5D3C7411F7CEB18004660F5 /* VideoCapturerDevice.swift */,
 				9174A8921F73F8CF00D586C4 /* VideoCodec.swift */,
 				91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */,
 				91B1D6451D75E11F00112A4E /* VideoRenderer.swift */,
@@ -397,7 +391,6 @@
 				91A19B8E1F19367700A76852 /* MediaChannel.swift in Sources */,
 				915CEC901F821A90006E45E2 /* CameraVideoCapturer.swift in Sources */,
 				91672C791F78F7FC002300E7 /* WebRTCConfigration.swift in Sources */,
-				9174A89B1F73F9EE00D586C4 /* CameraPosition.swift in Sources */,
 				916134DD1F7B5EFF00ABDDAF /* AspectRatio.swift in Sources */,
 				9174A8951F73F90B00D586C4 /* AudioCodec.swift in Sources */,
 				91A19B8A1F19366000A76852 /* SignalingChannel.swift in Sources */,
@@ -428,7 +421,6 @@
 				9174A8991F73F9A200D586C4 /* TLSSecurityPolicy.swift in Sources */,
 				9128A4A91F2A6CB100AC6B1E /* MediaStream.swift in Sources */,
 				9141AB641F4204C0007C4D1C /* ConnectionTimer.swift in Sources */,
-				C5D3C7421F7CEB18004660F5 /* VideoCapturerDevice.swift in Sources */,
 				916B0B992553D9620035B5F9 /* AudioMode.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -594,7 +586,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2023.2.0;
+				MARKETING_VERSION = 2023.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -628,7 +620,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2023.2.0;
+				MARKETING_VERSION = 2023.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

Sora/CameraVideoCapturer.swift

@@ -141,13 +141,6 @@ public final class CameraVideoCapturer {
         device.position
     }
 
-    /// 使用中のカメラの位置に対応するデバイス
-    /// captureDevice に変更されました
-    @available(*, deprecated, renamed: "captureDevice")
-    public var currentCameraDevice: AVCaptureDevice? {
-        device
-    }
-
     /// 使用中のデバイス
     public var device: AVCaptureDevice
 
@@ -315,51 +308,6 @@ public final class CameraVideoCapturer {
             }
         }
     }
-
-    // MARK: - 廃止された API
-
-    /// シングルトンインスタンス
-    /// shared は廃止されました。
-    @available(*, unavailable, message: "shared は廃止されました。")
-    public static var shared: CameraVideoCapturer?
-
-    /// 利用可能なデバイスのリスト
-    /// 名称が devices に変更されました
-    @available(*, unavailable, renamed: "devices")
-    public static var captureDevices: [AVCaptureDevice] { RTCCameraVideoCapturer.captureDevices() }
-
-    /// 指定したカメラ位置にマッチした最初のデバイスを返します。
-    /// 名称が device に変更されました
-    @available(*, unavailable, renamed: "device")
-    public static func captureDevice(for position: AVCaptureDevice.Position) -> AVCaptureDevice? {
-        nil
-    }
-
-    /// `true` であれば接続解除時にカメラを停止します。
-    /// 廃止されました。
-    @available(*, unavailable, message: "廃止されました")
-    public var canStop: Bool = false
-
-    /// :nodoc:
-    @available(*, unavailable, message: "suitableFrameRate は廃止されました。 maxFramerate を利用してください。")
-    public static func suitableFrameRate(for format: AVCaptureDevice.Format, frameRate: Int) -> Int? {
-        nil
-    }
-
-    /// カメラの設定
-    /// 廃止されました
-    @available(*, unavailable, message: "settings は廃止されました。")
-    public private(set) var settings: Any?
-
-    /// `true` であれば接続解除時にカメラを停止します。
-    @available(*, unavailable, message: "stopWhenDone は廃止されました。")
-    public private(set) var stopWhenDone: Bool = false
-
-    /// :nodoc:
-    @available(*, unavailable, message: "suitableFormat は廃止されました。 format を利用してください。")
-    public static func suitableFormat(for device: AVCaptureDevice, resolution: Any) -> AVCaptureDevice.Format? {
-        nil
-    }
 }
 
 /**