Skip to content

Commit

Permalink
Merge branch 'release/sora-ios-sdk-2021.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
miosakuma committed Nov 25, 2021
2 parents b418d65 + d8a89b3 commit a8f3fee
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
10 changes: 1 addition & 9 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ platform :ios, '12.1'

target 'SoraQuickStart' do
use_frameworks!
pod 'Sora', '2021.2.1'
pod 'Sora', '2021.3.0'

# シミュレーターのビルド用の設定です。 arm64 を除いてビルドします。
# Sora iOS SDK はシミュレーターでのビルドと動作をサポートしませんので、
# あくまで参考例としてご利用ください。
#
# post_install do |installer|
# installer.pods_project.build_configurations.each do |config|
# config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
# end
end
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Please read https://github.com/shiguredo/oss before use.

- iOS 12.1 以降
- アーキテクチャ arm64, x86_64 (シミュレーターの動作は未保証)
- macOS 11.3 以降
- Xcode 12.5
- Swift 5.4
- CocoaPods 1.10.1 以降
- macOS 12.0 以降
- Xcode 13.1
- Swift 5.5
- CocoaPods 1.11.2 以降
- WebRTC SFU Sora 2021.1 以降

Xcode と Swift のバージョンによっては、 Carthage と CocoaPods で取得できるバイナリに互換性がない可能性があります。詳しくは[ Sora iOS SDK ドキュメント](https://sora-ios-sdk.shiguredo.jp/) を参照してください。
Expand Down
2 changes: 0 additions & 2 deletions SoraQuickStart.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -265,7 +264,6 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down
3 changes: 2 additions & 1 deletion SoraQuickStart/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ class ViewController: UIViewController {

// ストリームが追加されたら受信用の VideoView をストリームにセットします。
// このアプリでは、複数のユーザーが接続した場合は最後のユーザーの映像のみ描画します。
let publisherStreamId = config.publisherStreamId
config.mediaChannelHandlers.onAddStream = { [weak self] stream in
guard let strongSelf = self else {
return
}
if stream.streamId != config.publisherStreamId {
if stream.streamId != publisherStreamId {
stream.videoRenderer = strongSelf.receiverVideoView
}
}
Expand Down

0 comments on commit a8f3fee

Please sign in to comment.