Using RingRTC podspec to make swift version independent (currently using dev
version of v0.2.0)
This commit is contained in:
Nora Trapp
parent
4a826a673b
commit
6299b7506d
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -7,3 +7,6 @@
|
||||
[submodule "ThirdParty/WebRTC"]
|
||||
path = ThirdParty/WebRTC
|
||||
url = https://github.com/signalapp/signal-webrtc-ios-artifacts
|
||||
[submodule "ThirdParty/RingRTC"]
|
||||
path = ThirdParty/RingRTC
|
||||
url = https://github.com/signalapp/ringrtc
|
||||
|
||||
3
Podfile
3
Podfile
@ -71,6 +71,7 @@ end
|
||||
target 'Signal' do
|
||||
shared_pods
|
||||
pod 'SSZipArchive', :inhibit_warnings => true
|
||||
pod 'SignalRingRTC', path: 'ThirdParty/SignalRingRTC.podspec', inhibit_wranings: true
|
||||
|
||||
target 'SignalTests' do
|
||||
inherit! :search_paths
|
||||
@ -147,4 +148,4 @@ def disable_bitcode(installer)
|
||||
config.build_settings['ENABLE_BITCODE'] = 'NO'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
12
Podfile.lock
12
Podfile.lock
@ -106,6 +106,11 @@ PODS:
|
||||
- HKDFKit
|
||||
- SignalCoreKit
|
||||
- SwiftProtobuf
|
||||
- SignalRingRTC (0.2.0):
|
||||
- SignalCoreKit
|
||||
- SignalRingRTC/WebRTC (= 0.2.0)
|
||||
- SignalRingRTC/WebRTC (0.2.0):
|
||||
- SignalCoreKit
|
||||
- SignalServiceKit (0.9.0):
|
||||
- AFNetworking
|
||||
- AxolotlKit
|
||||
@ -240,6 +245,7 @@ DEPENDENCIES:
|
||||
- SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`)
|
||||
- "SignalMetadataKit (from `git@github.com:signalapp/SignalMetadataKit`)"
|
||||
- "SignalMetadataKit/Tests (from `git@github.com:signalapp/SignalMetadataKit`)"
|
||||
- SignalRingRTC (from `ThirdParty/SignalRingRTC.podspec`)
|
||||
- SignalServiceKit (from `.`)
|
||||
- SignalServiceKit/Tests (from `.`)
|
||||
- SQLCipher (>= 4.0.1)
|
||||
@ -285,6 +291,9 @@ EXTERNAL SOURCES:
|
||||
:git: https://github.com/signalapp/SignalCoreKit.git
|
||||
SignalMetadataKit:
|
||||
:git: "git@github.com:signalapp/SignalMetadataKit"
|
||||
SignalRingRTC:
|
||||
:inhibit_wranings: true
|
||||
:path: ThirdParty/SignalRingRTC.podspec
|
||||
SignalServiceKit:
|
||||
:path: "."
|
||||
Starscream:
|
||||
@ -345,6 +354,7 @@ SPEC CHECKSUMS:
|
||||
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
|
||||
SignalCoreKit: 4562b2bbd9830077439ca003f952a798457d4ea5
|
||||
SignalMetadataKit: a7aacedf262d947c22e2c619f0fd217163d2a637
|
||||
SignalRingRTC: f97baf94c1fd6081f30284df5bc485aeb2e51d0a
|
||||
SignalServiceKit: 71856e789067b45672443a9fdc5152409db2cd19
|
||||
SQLCipher: 4636a257060f6f1b4e143a143028b61a2b462d0d
|
||||
SSZipArchive: 41455d4b8d2b6ab93990820b50dc697c2554a322
|
||||
@ -353,6 +363,6 @@ SPEC CHECKSUMS:
|
||||
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
|
||||
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
||||
|
||||
PODFILE CHECKSUM: 2f7a0f003a761c1fc599028af38507ef1fc295b7
|
||||
PODFILE CHECKSUM: 666e996ddd27bb935eec34e3170b68f5a6e388af
|
||||
|
||||
COCOAPODS: 1.7.5
|
||||
|
||||
2
Pods
2
Pods
@ -1 +1 @@
|
||||
Subproject commit 1f40611aa55a3d613bbd9e8083088da7a347e87e
|
||||
Subproject commit b72d10603faa05011f458afd17dfc5b6a5682714
|
||||
@ -3597,9 +3597,7 @@
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
|
||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
|
||||
"$(SRCROOT)/ThirdParty/WebRTC/Build/SignalRingRTC.framework",
|
||||
);
|
||||
name = "[Carthage] Copy Frameworks";
|
||||
outputPaths = (
|
||||
@ -3644,7 +3642,6 @@
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
|
||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
|
||||
);
|
||||
name = "[Carthage] Copy Frameworks";
|
||||
@ -3677,6 +3674,8 @@
|
||||
"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/SignalRingRTC/SignalRingRTC.framework",
|
||||
"${PODS_ROOT}/../ThirdParty/WebRTC/Build/WebRTC.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
||||
@ -3705,6 +3704,8 @@
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalRingRTC.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebRTC.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
<key>BuildDetails</key>
|
||||
<dict>
|
||||
<key>CarthageVersion</key>
|
||||
<string>0.34.0</string>
|
||||
<string>0.33.0</string>
|
||||
<key>OSXVersion</key>
|
||||
<string>10.14.6</string>
|
||||
<string>10.15.1</string>
|
||||
<key>WebRTCCommit</key>
|
||||
<string>f9af10871584439f9fe9505ef767680797690326 Production build of v0.3.0</string>
|
||||
<string>bff46565f34ddbcdcc73cf6edb3887af2c930574 Development build of v0.2.0</string>
|
||||
</dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
|
||||
1
ThirdParty/RingRTC
vendored
Submodule
1
ThirdParty/RingRTC
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 89b0e4bac4a1da2c772f210c2f20d7f743ce709f
|
||||
45
ThirdParty/SignalRingRTC.podspec
vendored
Normal file
45
ThirdParty/SignalRingRTC.podspec
vendored
Normal file
@ -0,0 +1,45 @@
|
||||
#
|
||||
# Be sure to run `pod lib lint SignalRingRTC.podspec' to ensure this is a
|
||||
# valid spec before submitting.
|
||||
#
|
||||
# Any lines starting with a # are optional, but their use is encouraged
|
||||
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
|
||||
#
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "SignalRingRTC"
|
||||
s.version = "0.2.0"
|
||||
s.summary = "A Swift & Objective-C library used by the Signal iOS app for WebRTC interactions."
|
||||
|
||||
s.description = <<-DESC
|
||||
A Swift & Objective-C library used by the Signal iOS app for WebRTC interactions."
|
||||
DESC
|
||||
|
||||
s.license = 'GPLv3'
|
||||
s.homepage = 'https://github.com/signalapp/ringrtc'
|
||||
s.source = { git: 'https://github.com/signalapp/ringrtc.git', tag: "v#{s.version.to_s}" }
|
||||
s.author = { 'iOS Team': 'ios@signal.org' }
|
||||
s.social_media_url = 'https://twitter.com/signalapp'
|
||||
|
||||
s.platform = :ios, '10.0'
|
||||
s.requires_arc = true
|
||||
|
||||
s.source_files = 'RingRTC/src/ios/SignalRingRTC/SignalRingRTC/**/*.{h,m,swift}', 'WebRTC/Build/libringrtc/**/*.h'
|
||||
s.public_header_files = 'RingRTC/src/ios/SignalRingRTC/SignalRingRTC/**/*.h'
|
||||
s.private_header_files = 'WebRTC/Build/libringrtc/*.h'
|
||||
|
||||
s.vendored_libraries = 'WebRTC/Build/libringrtc/libringrtc.a'
|
||||
s.libraries = 'ringrtc'
|
||||
|
||||
s.module_map = 'RingRTC/src/ios/SignalRingRTC/SignalRingRTC/SignalRingRTC.modulemap'
|
||||
|
||||
s.dependency 'SignalCoreKit'
|
||||
|
||||
s.test_spec 'Tests' do |test_spec|
|
||||
test_spec.source_files = 'RingRTC/src/ios/SignalRingRTC/SignalRingRTCTests/**/*.{h,m,swift}'
|
||||
end
|
||||
|
||||
s.subspec 'WebRTC' do |webrtc|
|
||||
webrtc.vendored_frameworks = 'WebRTC/Build/WebRTC.framework'
|
||||
end
|
||||
end
|
||||
2
ThirdParty/WebRTC
vendored
2
ThirdParty/WebRTC
vendored
@ -1 +1 @@
|
||||
Subproject commit 6d371e680fe275b7d27596dfc875583ee121ec0c
|
||||
Subproject commit bff46565f34ddbcdcc73cf6edb3887af2c930574
|
||||
Loading…
Reference in New Issue
Block a user