Skip to content

Commit

Permalink
Merge pull request #213 from shiguredo/feature/update-libwebrtc-129.6…
Browse files Browse the repository at this point in the history
…668.1.0

libwebrtc 129.6668.1.0, iOS 14.0 にあげる
  • Loading branch information
miosakuma authored Oct 4, 2024
2 parents 905635c + 988634e commit 9cad983
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 21 deletions.
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@

## develop

- [UPDATE] WebRTC m129.6668.1.0 に上げる
- @miosakuma
- [UPDATE] システム条件の iOS を 14.0 に上げる
- IPHONEOS_DEPLOYMENT_TARGET を 14.0 に上げる
- SwiftPM の platforms の設定を v14 に上げる
- CocoaPods の platform の設定を 14.0 に上げる
- libwebrtc の対象バージョンに追従した
- https://webrtc.googlesource.com/src/+/9b81d2c954128831c62d8a0657c7f955b3c02d32
- @miosakuma

## 2024.3.0

**リリース日**: 2024-09-06
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import Foundation
import PackageDescription

let file = "WebRTC-127.6533.1.1/WebRTC.xcframework.zip"
let file = "WebRTC-129.6668.1.0/WebRTC.xcframework.zip"

let package = Package(
name: "Sora",
platforms: [.iOS(.v13)],
platforms: [.iOS(.v14)],
products: [
.library(name: "Sora", targets: ["Sora"]),
.library(name: "WebRTC", targets: ["WebRTC"]),
Expand All @@ -16,7 +16,7 @@ let package = Package(
.binaryTarget(
name: "WebRTC",
url: "https://github.com/shiguredo/sora-ios-sdk-specs/releases/download/\(file)",
checksum: "b9242358b4d53cafdf19d75a731cea87c84205475f54816e3a5cfd99cdb03216"
checksum: "c23dc224a8edd61410c089696dc34c03c81712672b0e419df627d4e1fc15bafc"
),
.target(
name: "Sora",
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'https://cdn.cocoapods.org/'
source 'https://github.com/shiguredo/sora-ios-sdk-specs.git'

platform :ios, '13.0'
platform :ios, '14.0'

target 'Sora' do
use_frameworks!
pod 'WebRTC', '127.6533.1.1'
pod 'WebRTC', '129.6668.1.0'
end
4 changes: 2 additions & 2 deletions Podfile.dev
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://cdn.cocoapods.org/'
source 'https://github.com/shiguredo/sora-ios-sdk-specs.git'

platform :ios, '13.0'
platform :ios, '14.0'

target 'Sora' do
use_frameworks!
pod 'WebRTC', '127.6533.1.1'
pod 'WebRTC', '129.6668.1.0'
pod 'SwiftLint', '0.51.0'
pod 'SwiftFormat/CLI', '0.53.2'
end
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sora iOS SDK

[![libwebrtc](https://img.shields.io/badge/libwebrtc-127.6533-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/6533)
[![libwebrtc](https://img.shields.io/badge/libwebrtc-129.6668-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/6668)
[![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)

Expand All @@ -18,7 +18,7 @@ Please read https://github.com/shiguredo/oss before use.

## システム条件

- iOS 13 以降
- iOS 14 以降
- アーキテクチャ arm64 (シミュレーターの動作は未保証)
- macOS 14.6.1 以降
- Xcode 15.4
Expand Down
4 changes: 2 additions & 2 deletions Sora.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Pod::Spec.new do |s|
s.homepage = "https://github.com/shiguredo/sora-ios-sdk"
s.license = { :type => "Apache License, Version 2.0" }
s.authors = { "Shiguredo Inc." => "https://shiguredo.jp/" }
s.platform = :ios, "13.0"
s.platform = :ios, "14.0"
s.source = {
:git => "https://github.com/shiguredo/sora-ios-sdk.git",
:tag => s.version
}
s.source_files = "Sora/**/*.swift"
s.resources = ['Sora/*.xib']
s.dependency "WebRTC", '127.6533.1.1'
s.dependency "WebRTC", '129.6668.1.0'
s.pod_target_xcconfig = {
'ARCHS' => 'arm64',
'ARCHS[config=Debug]' => '$(ARCHS_STANDARD)'
Expand Down
8 changes: 4 additions & 4 deletions Sora.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "49e345ee-1e24-4cef-9228-9df5fc1f7525";
Expand Down Expand Up @@ -552,7 +552,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
PROVISIONING_PROFILE = "49e345ee-1e24-4cef-9228-9df5fc1f7525";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -584,7 +584,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Sora/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2024.3.0;
PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
Expand Down Expand Up @@ -618,7 +618,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Sora/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2024.3.0;
PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
Expand Down
12 changes: 6 additions & 6 deletions Sora/PackageInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ public enum SDKInfo {
*/
public enum WebRTCInfo {
/// WebRTC フレームワークのバージョン
public static let version = "M127"
public static let version = "M129"

/// WebRTC の branch-heads
public static let branch = "6668"

/// WebRTC フレームワークのコミットポジション
public static let commitPosition = "1"

/// WebRTC フレームワークのメンテナンスバージョン
public static let maintenanceVersion = "1"
public static let maintenanceVersion = "0"

/// WebRTC フレームワークのソースコードのリビジョン
public static let revision = "e0b28a6a81a989c1f5c89e30fcd247870047390d"

/// WebRTC の branch-heads
public static let branch = "6433"
public static let revision = "21508e08e7545a03c8c35a9299923279e3def319"

/// WebRTC フレームワークのソースコードのリビジョン (短縮版)
public static var shortRevision: String {
Expand Down

0 comments on commit 9cad983

Please sign in to comment.