Merge branch 'release/2024.2.0'

shiguredo · Apr 23, 2024 · 722d676 · 722d676
2 parents 9e9f3fb + e70dedc
commit 722d676
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,6 +52,14 @@ jobs:
     - name: Check uncommitted unformatted code
       run: |
         ./lint-format.sh
+    - name: Slack Notification
+      if: failure()
+      uses: rtCamp/action-slack-notify@v2
+      env:
+        SLACK_CHANNEL: sora-ios-sdk
+        SLACK_COLOR: danger
+        SLACK_TITLE: Build failed
+        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
   release:
     if: contains(github.ref, 'tags/v')
     needs: [build]

diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -8,12 +8,12 @@ theme: apple
 min_acl: public
 sdk: iphoneos
 module: Sora
-module_version: 2023.3.1
-swift_version: 5.9.2
+module_version: 2024.2.0
+swift_version: 5.10.0
 xcodebuild_arguments:
     - -parallelizeTargets
     - -sdk
-    - iphoneos17.2
+    - iphoneos17.4
     - -workspace
     - Sora.xcworkspace
     - -scheme

diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,20 @@
 
 ## develop
 
+## 2024.2.0
+
+- [CHANGE] シグナリング `connect` メッセージの `libwebrtc` に含まれるバージョン文字列を Android と揃える
+  - branch-heads を追加する
+  - () 内の libwebrtc バージョンについて最初の 1 文字を削る
+  - 送信される文字列は `Shiguredo-build M122 (M122.1.0 6b419a0)` から、`Shiguredo-build M122 (122.6261.1.0 6b419a0)` に変更される
+- [UPDATE] WebRTC m122.6261.1.0 に上げる
+  - @miosakuma
+- [UPDATE] システム条件を変更する
+  - macOS 14.4.1 以降
+  - Xcode 15.3
+  - Swift 5.10
+  - @miosakuma
+
 ## 2024.1.0
 
 - [CHANGE] SignalingNotify の metadataList を削除する

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import Foundation
 import PackageDescription
 
-let file = "WebRTC-121.6167.4.0/WebRTC.xcframework.zip"
+let file = "WebRTC-122.6261.1.0/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: "096ca45c53b7b77805e6368154462610a8182f61d58a796e69d7b4eb48378f44"
+            checksum: "dd5ce39710270c4498a1628461e00c17525369faf0ca0a7e258325b99f21ee8e"
         ),
         .target(
             name: "Sora",

diff --git a/Podfile b/Podfile
@@ -5,5 +5,5 @@ platform :ios, '13.0'
 
 target 'Sora' do
   use_frameworks!
-  pod 'WebRTC', '121.6167.4.0'
+  pod 'WebRTC', '122.6261.1.0'
 end
diff --git a/Podfile.dev b/Podfile.dev
@@ -5,7 +5,7 @@ platform :ios, '13.0'
 
 target 'Sora' do
   use_frameworks!
-  pod 'WebRTC', '121.6167.4.0'
+  pod 'WebRTC', '122.6261.1.0'
   pod 'SwiftLint', '0.51.0'
   pod 'SwiftFormat/CLI', '0.53.2'
 end
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Sora iOS SDK
 
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-121.6167-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/6167)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-123.6312-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/6312)
 [![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)
 
@@ -20,9 +20,9 @@ Please read https://github.com/shiguredo/oss before use.
 
 - iOS 13 以降
 - アーキテクチャ arm64 (シミュレーターの動作は未保証)
-- macOS 14.3.1 以降
-- Xcode 15.2
-- Swift 5.9.2
+- macOS 14.4.1 以降
+- Xcode 15.3
+- Swift 5.10
 - CocoaPods 1.15.2 以降
 - WebRTC SFU Sora 2023.2.0 以降
 
@@ -37,6 +37,11 @@ Xcode と Swift のバージョンによっては、 CocoaPods で取得でき
 
 [Sora iOS SDK ドキュメント — Sora iOS SDK](https://sora-ios-sdk.shiguredo.jp/)
 
+## 有償での優先実装
+
+- 帯域幅制限時に解像度またはフレームレートのどちらを維持するか指定できるようにする機能
+  - 企業名非公開
+
 ## 有償での優先実装が可能な機能一覧
 
 **詳細は Discord またはメールにてお問い合わせください**
@@ -54,8 +59,8 @@ Xcode と Swift のバージョンによっては、 CocoaPods で取得でき
 Apache License 2.0
 
 ```
+Copyright 2017-2024, Shiguredo Inc.
 Copyright 2017-2023, SUZUKI Tetsuya (Original Author)
-Copyright 2017-2023, Shiguredo Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/Sora.podspec b/Sora.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sora"
-  s.version      = "2024.1.0"
+  s.version      = "2024.2.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", '121.6167.4.0'
+  s.dependency "WebRTC", '122.6261.1.0'
   s.pod_target_xcconfig = {
     'ARCHS' => 'arm64',
     'ARCHS[config=Debug]' => '$(ARCHS_STANDARD)'

diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj
@@ -586,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 = 2024.1.0;
+				MARKETING_VERSION = 2024.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -620,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 = 2024.1.0;
+				MARKETING_VERSION = 2024.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

diff --git a/Sora/PackageInfo.swift b/Sora/PackageInfo.swift
@@ -1,24 +1,27 @@
 /// :nodoc:
 public enum SDKInfo {
     // Sora iOS SDK のバージョンを定義する
-    public static let version = "2024.1.0"
+    public static let version = "2024.2.0"
 }
 
 /**
  WebRTC フレームワークの情報を表します。
  */
 public enum WebRTCInfo {
     /// WebRTC フレームワークのバージョン
-    public static let version = "M121"
+    public static let version = "M122"
 
     /// WebRTC フレームワークのコミットポジション
-    public static let commitPosition = "4"
+    public static let commitPosition = "1"
 
     /// WebRTC フレームワークのメンテナンスバージョン
     public static let maintenanceVersion = "0"
 
     /// WebRTC フレームワークのソースコードのリビジョン
-    public static let revision = "0f741da200c064aea70a790d2fbf678e930bff39"
+    public static let revision = "6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8"
+
+    /// WebRTC の branch-heads
+    public static let branch = "6261"
 
     /// WebRTC フレームワークのソースコードのリビジョン (短縮版)
     public static var shortRevision: String {

diff --git a/Sora/PeerChannel.swift b/Sora/PeerChannel.swift
@@ -307,7 +307,7 @@ class PeerChannel: NSObject, RTCPeerConnectionDelegate {
 
         let soraClient = "Sora iOS SDK \(SDKInfo.version)"
 
-        let webRTCVersion = "Shiguredo-build \(WebRTCInfo.version) (\(WebRTCInfo.version).\(WebRTCInfo.commitPosition).\(WebRTCInfo.maintenanceVersion) \(WebRTCInfo.shortRevision))"
+        let webRTCVersion = "Shiguredo-build \(WebRTCInfo.version) (\(WebRTCInfo.version.dropFirst()).\(WebRTCInfo.branch).\(WebRTCInfo.commitPosition).\(WebRTCInfo.maintenanceVersion) \(WebRTCInfo.shortRevision))"
 
         let simulcast = configuration.simulcastEnabled
         let connect = SignalingConnect(