Merge branch 'release/sora-ios-sdk-2024.2.0'

.github/workflows/build.yml

@@ -11,10 +11,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-14
     env:
-      XCODE: /Applications/Xcode_14.3.1.app
-      XCODE_SDK: iphoneos16.4
+      XCODE: /Applications/Xcode_15.2.app
+      XCODE_SDK: iphoneos17.2
     steps:
     - uses: actions/checkout@v4
     - name: Select Xcode Version
@@ -24,7 +24,7 @@ jobs:
     - name: Show CocoaPods Version
       run: pod --version
     - name: Restore Pods
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: Pods
         key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
@@ -50,7 +50,8 @@ jobs:
             CODE_SIGNING_REQUIRED=NO \
             CODE_SIGNING_ALLOWED=NO \
             CODE_SIGN_IDENTITY= \
-            PROVISIONING_PROFILE=
+            PROVISIONING_PROFILE= \
+            ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS=NO
     - name: Check uncommitted unformatted code
       run: |
         ./lint-format.sh

.swift-version

@@ -1 +1 @@
-5.5.1
+5.8

CHANGES.md

@@ -11,6 +11,25 @@
 
 ## develop
 
+## sora-ios-sdk-2024.2.0
+
+- [UPDATE] Github Actions を actions/cache@v4 にあげる
+  - @miosakuma
+- [UPDATE] Github Actions を macos-14  にあげる
+  - @miosakuma
+- [UPDATE] Github Actions を Xcode 15.2, iphoneos17.2 にあげる
+  - @miosakuma
+- [UPDATE] Github Actions のビルドオプションに `ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS=NO` を追加する
+  - Xcode 15 で Asset のシンボルである、GeneratedAssetSymbols.swift が生成されるようになったがこのファイルが SwiftFormat エラー対象となる
+  - CI では Asset のシンボル生成は不要であるため生成しないようオプション指定を行う
+  - [Xcode 15 リリースノート - Asset Catalogs](https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Asset-Catalogs)
+  - @miosakuma
+- [UPDATE] システム条件を変更する
+  - macOS 14.4.1 以降
+  - Xcode 15.3
+  - Swift 5.10
+  - @miosakuma
+
 ## sora-ios-sdk-2024.1.0
 
 - [UPDATE] システム条件を変更する

Podfile

@@ -5,7 +5,7 @@ platform :ios, '13.0'
 
 target 'SoraQuickStart' do
   use_frameworks!
-  pod 'Sora', '2024.1.0'
+  pod 'Sora', '2024.2.0'
   pod 'SwiftLint'
   pod 'SwiftFormat/CLI'
 

README.md

@@ -16,9 +16,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 以降
 
@@ -41,3 +41,7 @@ Xcode と Swift のバージョンによっては、 CocoaPods で取得でき
    ```
 
 3. ``SoraQuickStart.xcworkspace`` を Xcode で開いてビルドします。
+
+## ライセンス
+
+このリポジトリに含まれるすべてのアプリアイコン画像（すべての PNG 形式ファイル）のライセンスは [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.ja) です。

SoraQuickStart/AppDelegate.swift

@@ -1,6 +1,6 @@
 import UIKit
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.

SoraQuickStart/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,103 +1,158 @@
 {
   "images" : [
     {
+      "filename" : "40.png",
       "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
+      "filename" : "60.png",
       "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
+      "filename" : "29.png",
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
+      "filename" : "58.png",
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
+      "filename" : "87.png",
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
+      "filename" : "80.png",
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "120.png",
       "idiom" : "iphone",
-      "filename" : "iphone-app@2x.png",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "57.png",
       "idiom" : "iphone",
-      "filename" : "iphone-app@3x.png",
-      "scale" : "3x"
+      "scale" : "1x",
+      "size" : "57x57"
     },
     {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "40.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "40.png",
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
+      "filename" : "80.png",
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
+      "filename" : "50.png",
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "50x50"
     },
     {
+      "filename" : "100.png",
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "50x50"
     },
     {
+      "filename" : "72.png",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "72x72"
     },
     {
+      "filename" : "144.png",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "72x72"
     },
     {
-      "size" : "76x76",
+      "filename" : "76.png",
       "idiom" : "ipad",
-      "filename" : "ipad-app@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size" : "76x76",
+      "filename" : "152.png",
       "idiom" : "ipad",
-      "filename" : "ipad-app@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "size" : "83.5x83.5",
+      "filename" : "167.png",
       "idiom" : "ipad",
-      "filename" : "ipad-pro-app@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

SoraQuickStart/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SoraQuickStart/ViewController.swift

@@ -83,7 +83,7 @@ class ViewController: UIViewController {
             guard let strongSelf = self else {
                 return
             }
-            if let error = error {
+            if let error {
                 NSLog(error.localizedDescription)
                 DispatchQueue.main.async {
                     let alertController = UIAlertController(title: "接続に失敗しました",
@@ -101,7 +101,7 @@ class ViewController: UIViewController {
         // 接続試行中の状態を強制的に終了させることができます。
         connectionTask = Sora.shared.connect(configuration: config) { mediaChannel, error in
             // 接続に失敗するとエラーが渡されます。
-            if let error = error {
+            if let error {
                 NSLog(error.localizedDescription)
                 DispatchQueue.main.async { [weak self] in
                     let alertController = UIAlertController(title: "接続に失敗しました",