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

.github/workflows/data-channel-sample.yml

@@ -15,10 +15,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
       WORKSPACE: DataChannelSample
       SCHEME: DataChannelSample
     steps:
@@ -30,7 +30,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') }}
@@ -57,7 +57,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

.github/workflows/deco-streaming-sample.yml

@@ -15,10 +15,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
       WORKSPACE: DecoStreamingSample
       SCHEME: DecoStreamingSample
     steps:
@@ -30,7 +30,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') }}
@@ -57,7 +57,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

.github/workflows/screencast-sample.yml

@@ -15,10 +15,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
       WORKSPACE: ScreenCastSample
       SCHEME: ScreenCastSample
     steps:
@@ -30,7 +30,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') }}
@@ -57,7 +57,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

.github/workflows/simulcast-sample.yml

@@ -15,10 +15,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
       WORKSPACE: SimulcastSample
       SCHEME: SimulcastSample
     steps:
@@ -30,7 +30,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') }}
@@ -57,7 +57,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

.github/workflows/spotlight-sample.yml

@@ -15,10 +15,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
       WORKSPACE: SpotlightSample
       SCHEME: SpotlightSample
     steps:
@@ -30,7 +30,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') }}
@@ -57,7 +57,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

.github/workflows/video-chat-sample.yml

@@ -15,10 +15,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
       WORKSPACE: VideoChatSample
       SCHEME: VideoChatSample
     steps:
@@ -30,7 +30,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') }}
@@ -57,7 +57,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

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] システム条件を変更する

DataChannelSample/.swift-version

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

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

@@ -1,91 +1,151 @@
 {
   "images" : [
     {
+      "filename" : "40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "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",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "80.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "50.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "100.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "72.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "144.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

DataChannelSample/DataChannelSample/ConfigViewController.swift

@@ -225,7 +225,7 @@ class ConfigViewController: UITableViewController {
             // 接続処理が終了したので false にします。
             self?.isConnecting = false
 
-            if let error = error {
+            if let error {
                 // errorがnilでないばあいは、接続に失敗しています。
                 // この場合は、エラー表示をユーザーに返すのが親切です。
                 // なお、このコールバックはメインスレッド以外のスレッドから呼び出される可能性があるので、