Skip to content

Commit

Permalink
Merge branch 'release/sora-ios-sdk-2022.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
miosakuma committed Mar 11, 2022
2 parents f9b4f12 + d4c5629 commit 32aa464
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
build:
runs-on: macOS-latest
env:
XCODE: /Applications/Xcode_12.4.app
XCODE_SDK: iphoneos14.4
XCODE: /Applications/Xcode_13.2.1.app
XCODE_SDK: iphoneos15.2
steps:
- uses: actions/checkout@v2
- name: Select Xcode Version
Expand Down
17 changes: 17 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# 変更履歴

- UPDATE
- 下位互換がある変更
- ADD
- 下位互換がある追加
- CHANGE
- 下位互換のない変更
- FIX
- バグ修正

## develop

## sora-ios-sdk-2022.2.0

- [UPDATE] Environment.example.swift に signalingConnectMetadata を追加する
- @miosakuma
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ platform :ios, '13.0'

target 'SoraQuickStart' do
use_frameworks!
pod 'Sora', '2022.1.1'
pod 'Sora', '2022.2.0'

pod 'SwiftLint'
pod 'SwiftFormat/CLI'
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,8 @@ Xcode と Swift のバージョンによっては、 Carthage と CocoaPods で

2. ``SoraQuickStart/Environment.example.swift`` のファイル名を ``SoraQuickStart/Environment.swift`` に変更し、接続情報を設定します。

```
$ cp SoraQuickStart/Environment.example.swift SoraQuickStart/Environment.swift
```

3. ``SoraQuickStart.xcworkspace`` を Xcode で開いてビルドします。
3 changes: 2 additions & 1 deletion SoraQuickStart/Environment.example.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import Foundation

enum Environment {

// 接続するサーバーのシグナリング URL
static let url = URL(string: "wss://sora.example.com/signaling")!

// チャネル ID
static let channelId = "sora"

// type: connect に含めるメタデータ
static let signalingConnectMetadata: Encodable? = nil
}
5 changes: 4 additions & 1 deletion SoraQuickStart/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,14 @@ class ViewController: UIViewController {

func connect() {
// 接続の設定を行います。
let config = Configuration(url: Environment.url,
var config = Configuration(url: Environment.url,
channelId: Environment.channelId,
role: .sendrecv,
multistreamEnabled: true)

// 接続時に指定したいオプションを以下のように設定します。
config.signalingConnectMetadata = Environment.signalingConnectMetadata

// ストリームが追加されたら受信用の VideoView をストリームにセットします。
// このアプリでは、複数のユーザーが接続した場合は最後のユーザーの映像のみ描画します。
let publisherStreamId = config.publisherStreamId
Expand Down

0 comments on commit 32aa464

Please sign in to comment.