Merge branch 'release/2022.6.0'

.github/workflows/build.yml

@@ -12,10 +12,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-11
+    runs-on: macos-12
     env:
-      XCODE: /Applications/Xcode_13.1.app
-      XCODE_SDK: iphoneos15.0
+      XCODE: /Applications/Xcode_13.4.1.app
+      XCODE_SDK: iphoneos15.5
     steps:
     - uses: actions/checkout@v2
     - name: Select Xcode Version

.jazzy.yaml

@@ -8,12 +8,12 @@ theme: apple
 min_acl: public
 sdk: iphoneos
 module: Sora
-module_version: 2022.5.0
-swift_version: 5.6.1
+module_version: 2022.6.0
+swift_version: 5.7
 xcodebuild_arguments:
     - -parallelizeTargets
     - -sdk
-    - iphoneos15.5
+    - iphoneos16.0
     - -workspace
     - Sora.xcworkspace
     - -scheme

CHANGES.md

@@ -11,12 +11,28 @@
 
 ## develop
 
+## 2022.6.0
+
+- [CHANGE] bitcode を無効にする
+    - WebRTC 105.5195.0.0 より bitcode が廃止になりました。bitcode を無効にしてビルドをする必要があります
+    - @miosakuma
+- [CHANGE] 対応アーキテクチャから x86_64 を無効にする
+    - @miosakuma
+- [UPDATE] WebRTC 105.5195.0.0 に上げる
+    - @miosakuma
+- [UPDATE] システム条件を変更する
+    - macOS 12.6 以降
+    - Xcode 14.0
+    - Swift 5.7
+    - CocoaPods 1.11.3 以降
+    - @miosakuma
+
 ## 2022.5.0
 
 - [UPDATE] WebRTC 104.5112.8.0 に上げる
     - @miosakuma
 - [ADD] HTTP プロキシに対応する
-  - @enm10k
+    - @enm10k
 
 ## 2022.4.0
 
@@ -112,7 +128,7 @@
     - @enm10k
 - [FIX] VideoView に debugMode = true を設定した際にメモリー・リークが発生する問題を修正する
     - @szktty @enm10k
-    
+
 ## 2021.3.1
 
 - [FIX] RTCPeerConnectionState が .failed に遷移した際の切断処理中にクラッシュする問題を修正する
@@ -771,7 +787,7 @@
     - ``WebSocketChannel``
     - @szktty
 - [ADD] ``Role``
-  - ``.group`` を追加する
+    - ``.group`` を追加する
     - @szktty
 
 ## 1.2.5

Package.swift

@@ -3,7 +3,7 @@
 import Foundation
 import PackageDescription
 
-let file = "WebRTC-104.5112.8.0/WebRTC.xcframework.zip"
+let file = "WebRTC-105.5195.0.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: "ec6feb3bcfd778bd7164d2de518eeaa1dfa0d1b721540985662fb7565c8b3223"
+            checksum: "ba83cb1a7c121ad5c803959a8ca8425ae61cae9dd3bdca7870a6c88f92402b14"
         ),
         .target(
             name: "Sora",

Podfile

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

Podfile.dev

@@ -5,7 +5,7 @@ platform :ios, '13.0'
 
 target 'Sora' do
   use_frameworks!
-  pod 'WebRTC', '104.5112.8.0'
+  pod 'WebRTC', '105.5195.0.0'
   pod 'SwiftLint', '0.45.1'
   pod 'SwiftFormat/CLI', '0.49.0'
 end

README.md

@@ -1,6 +1,6 @@
 # Sora iOS SDK
 
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-104.5112-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5112)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-105.5195-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5195)
 [![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)
 
@@ -19,11 +19,11 @@ Please read https://github.com/shiguredo/oss before use.
 ## システム条件
 
 - iOS 13 以降
-- アーキテクチャ arm64, x86_64 (シミュレーターの動作は未保証)
-- macOS 12.3 以降
-- Xcode 13.4.1
-- Swift 5.6.1
-- CocoaPods 1.11.2 以降
+- アーキテクチャ arm64 (シミュレーターの動作は未保証)
+- macOS 12.6 以降
+- Xcode 14.0
+- Swift 5.7
+- CocoaPods 1.11.3 以降
 - WebRTC SFU Sora 2022.1.1 以降
 
 Xcode と Swift のバージョンによっては、 CocoaPods で取得できるバイナリに互換性がない可能性があります。詳しくはドキュメントを参照してください。

Sora.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sora"
-  s.version      = "2022.5.0"
+  s.version      = "2022.6.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", '104.5112.8.0'
+  s.dependency "WebRTC", '105.5195.0.0'
   s.pod_target_xcconfig = {
     'ARCHS' => 'arm64',
     'ARCHS[config=Debug]' => '$(ARCHS_STANDARD)'

Sora.xcodeproj/project.pbxproj

@@ -485,6 +485,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -509,7 +510,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64 x86_64";
+				VALID_ARCHS = arm64;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -548,6 +549,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -566,7 +568,7 @@
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "arm64 x86_64";
+				VALID_ARCHS = arm64;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -584,15 +586,15 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Sora/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2022.5.0;
+				MARKETING_VERSION = 2022.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -601,7 +603,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 x86_64";
+				VALID_ARCHS = arm64;
 			};
 			name = Debug;
 		};
@@ -617,23 +619,23 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Sora/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2022.5.0;
+				MARKETING_VERSION = 2022.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 x86_64";
+				VALID_ARCHS = arm64;
 			};
 			name = Release;
 		};

Sora/PackageInfo.swift

@@ -1,24 +1,24 @@
 /// :nodoc:
 public enum SDKInfo {
     // Sora iOS SDK のバージョンを定義する
-    public static let version = "2022.5.0"
+    public static let version = "2022.6.0"
 }
 
 /**
  WebRTC フレームワークの情報を表します。
  */
 public enum WebRTCInfo {
     /// WebRTC フレームワークのバージョン
-    public static let version = "M104"
+    public static let version = "M105"
 
     /// WebRTC フレームワークのコミットポジション
-    public static let commitPosition = "8"
+    public static let commitPosition = "0"
 
     /// WebRTC フレームワークのメンテナンスバージョン
     public static let maintenanceVersion = "0"
 
     /// WebRTC フレームワークのソースコードのリビジョン
-    public static let revision = "06aea31d10f860ae4236e3422252557762d39188"
+    public static let revision = "dc5cf31cad576376abd3aa6306169453cfd85ba5"
 
     /// WebRTC フレームワークのソースコードのリビジョン (短縮版)
     public static var shortRevision: String {