Convert to just using CocoaPods for dependencies
This commit is contained in:
Orta Therox
Nora Trapp
parent
6e4ba40659
commit
469e169962
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,6 +1,3 @@
|
||||
[submodule "ThirdParty/Carthage"]
|
||||
path = ThirdParty/Carthage
|
||||
url = https://github.com/signalapp/Signal-Carthage.git
|
||||
[submodule "Pods"]
|
||||
path = Pods
|
||||
url = https://github.com/signalapp/Signal-Pods.git
|
||||
|
||||
11
BUILDING.md
11
BUILDING.md
@ -2,11 +2,10 @@
|
||||
|
||||
We typically develop against the latest stable version of Xcode.
|
||||
|
||||
As of this writing, that's Xcode 10.1
|
||||
## Pre-requisites
|
||||
|
||||
## Prerequistes
|
||||
|
||||
Install [Carthage](https://github.com/Carthage/Carthage#installing-carthage)
|
||||
* You need Xcode 10 installed, we're currently using 10.1
|
||||
* You need to be using Ruby 2.5.0
|
||||
|
||||
## 1. Clone
|
||||
|
||||
@ -16,7 +15,7 @@ Clone the repo to a working directory:
|
||||
git clone --recurse-submodules https://github.com/signalapp/Signal-iOS
|
||||
```
|
||||
|
||||
Since we make use of submodules, you must use `git clone`, rather than
|
||||
Since we make use of sub-modules, you must use `git clone`, rather than
|
||||
downloading a prepared zip file from Github.
|
||||
|
||||
We recommend you fork the repo on GitHub, then clone your fork:
|
||||
@ -41,7 +40,7 @@ make dependencies
|
||||
|
||||
### Building WebRTC
|
||||
|
||||
A prebuilt version of WebRTC.framework resides in a submodule and should be
|
||||
A prebuilt version of WebRTC.framework resides in a sub-module and should be
|
||||
installed by the above steps. However, if you'd like to build it from source,
|
||||
see: https://github.com/signalapp/signal-webrtc-ios
|
||||
|
||||
|
||||
@ -5,16 +5,14 @@ For transparency and bus factor, they are outlined here.
|
||||
|
||||
## Dependencies
|
||||
|
||||
Keeping cocoapods based dependencies is easy enough.
|
||||
Keeping CocoaPods based dependencies is easy enough.
|
||||
|
||||
`pod update`
|
||||
- To just update one dependency: `bundle exec pod update DependencyKit`
|
||||
- To update all dependencies to the latest according to the Podfile range: `bundle exec pod update`
|
||||
|
||||
Similarly, Carthage dependencies can be updated like so:
|
||||
|
||||
`carthage update`
|
||||
|
||||
WebRTC updates are managed separately and manually based on
|
||||
https://github.com/signalapp/signal-webrtc-ios
|
||||
WebRTC updates are managed separately, and manually based on:
|
||||
- https://github.com/signalapp/signal-webrtc-ios
|
||||
- You can find the latest build at https://github.com/signalapp/signal-webrtc-ios-artifacts
|
||||
|
||||
## Translations
|
||||
|
||||
|
||||
14
Makefile
14
Makefile
@ -13,7 +13,6 @@ default: test
|
||||
|
||||
update_dependencies:
|
||||
bundle exec pod update
|
||||
carthage update --platform iOS
|
||||
|
||||
setup:
|
||||
[ -x ${SETUP_HOOK_PATH} ] && ${SETUP_HOOK_PATH}
|
||||
@ -26,8 +25,6 @@ dependencies:
|
||||
git submodule foreach --recursive git clean -xfd && \
|
||||
git submodule foreach --recursive git reset --hard && \
|
||||
git submodule update --init
|
||||
cd $(THIRD_PARTY_DIR) && \
|
||||
carthage build --platform iOS
|
||||
|
||||
build: dependencies
|
||||
cd $(WORKING_DIR) && \
|
||||
@ -36,14 +33,3 @@ build: dependencies
|
||||
test:
|
||||
bundle exec fastlane test
|
||||
|
||||
clean: clean_carthage
|
||||
cd $(WORKING_DIR) && \
|
||||
$(XCODE_BUILD) clean | bundle exec xcpretty
|
||||
|
||||
clean_carthage:
|
||||
cd $(THIRD_PARTY_DIR) && \
|
||||
rm -fr Carthage/Build
|
||||
|
||||
# Migrating across swift versions requires me to run this sometimes
|
||||
clean_carthage_cache:
|
||||
rm -fr ~/Library/Caches/org.carthage.CarthageKit/
|
||||
|
||||
106
Podfile
106
Podfile
@ -1,75 +1,73 @@
|
||||
platform :ios, '10.0'
|
||||
source 'https://github.com/CocoaPods/Specs.git'
|
||||
|
||||
use_frameworks!
|
||||
|
||||
def shared_pods
|
||||
###
|
||||
# OWS Pods
|
||||
###
|
||||
|
||||
###
|
||||
# OWS Pods
|
||||
###
|
||||
pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
|
||||
# pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
|
||||
|
||||
pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
|
||||
# pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
|
||||
pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"]
|
||||
# pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"]
|
||||
|
||||
pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"]
|
||||
# pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"]
|
||||
pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', testspecs: ["Tests"]
|
||||
# pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"]
|
||||
|
||||
pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', testspecs: ["Tests"]
|
||||
# pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"]
|
||||
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
|
||||
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
|
||||
|
||||
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
|
||||
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
|
||||
pod 'SignalMetadataKit', git: 'git@github.com:signalapp/SignalMetadataKit', testspecs: ["Tests"]
|
||||
# pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
|
||||
|
||||
pod 'SignalMetadataKit', git: 'git@github.com:signalapp/SignalMetadataKit', testspecs: ["Tests"]
|
||||
# pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
|
||||
pod 'blurhash', git: 'https://github.com/signalapp/blurhash', branch: 'addPodspec'
|
||||
|
||||
pod 'blurhash', git: 'https://github.com/signalapp/blurhash', branch: 'addPodspec'
|
||||
pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
|
||||
|
||||
pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
|
||||
# Project does not compile with PromiseKit 6.7.1
|
||||
# see: https://github.com/mxcl/PromiseKit/issues/990
|
||||
pod 'PromiseKit', "6.5.3"
|
||||
|
||||
# Project does not compile with PromiseKit 6.7.1
|
||||
# see: https://github.com/mxcl/PromiseKit/issues/990
|
||||
pod 'PromiseKit', "6.5.3"
|
||||
###
|
||||
# forked third party pods
|
||||
###
|
||||
|
||||
###
|
||||
# forked third party pods
|
||||
###
|
||||
# pod 'GRDB.swift/SQLCipher', path: '../GRDB.swift'
|
||||
pod 'GRDB.swift/SQLCipher'
|
||||
|
||||
# pod 'GRDB.swift/SQLCipher', path: '../GRDB.swift'
|
||||
pod 'GRDB.swift/SQLCipher'
|
||||
# Includes some soon to be released "unencrypted header" changes required for the Share Extension
|
||||
pod 'SQLCipher', ">= 4.0.1"
|
||||
|
||||
# Includes some soon to be released "unencrypted header" changes required for the Share Extension
|
||||
pod 'SQLCipher', ">= 4.0.1"
|
||||
# Forked for performance optimizations that are not likely to be upstreamed as they are specific
|
||||
# to our limited use of Mantle
|
||||
pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master'
|
||||
# pod 'Mantle', path: '../Mantle'
|
||||
|
||||
# Forked for performance optimizations that are not likely to be upstreamed as they are specific
|
||||
# to our limited use of Mantle
|
||||
pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master'
|
||||
# pod 'Mantle', path: '../Mantle'
|
||||
# Forked for compatibily with the ShareExtension, changes have an open PR, but have not been merged.
|
||||
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
|
||||
# pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
|
||||
|
||||
# Forked for compatibily with the ShareExtension, changes have an open PR, but have not been merged.
|
||||
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
|
||||
# pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
|
||||
# Forked to incorporate our self-built binary artifact.
|
||||
pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework', branch: 'mkirk/1.0.2t'
|
||||
#pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'
|
||||
|
||||
# Forked to incorporate our self-built binary artifact.
|
||||
pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework', branch: 'mkirk/1.0.2t'
|
||||
#pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'
|
||||
pod 'Starscream', git: 'git@github.com:signalapp/Starscream.git', branch: 'signal-release'
|
||||
# pod 'Starscream', path: '../Starscream'
|
||||
|
||||
pod 'Starscream', git: 'git@github.com:signalapp/Starscream.git', branch: 'signal-release'
|
||||
# pod 'Starscream', path: '../Starscream'
|
||||
###
|
||||
# third party pods
|
||||
####
|
||||
|
||||
###
|
||||
# third party pods
|
||||
####
|
||||
|
||||
pod 'AFNetworking', inhibit_warnings: true
|
||||
pod 'PureLayout', :inhibit_warnings => true
|
||||
pod 'Reachability', :inhibit_warnings => true
|
||||
pod 'lottie-ios', :inhibit_warnings => true
|
||||
end
|
||||
pod 'AFNetworking', inhibit_warnings: true
|
||||
pod 'PureLayout', :inhibit_warnings => true
|
||||
pod 'Reachability', :inhibit_warnings => true
|
||||
pod 'lottie-ios', :inhibit_warnings => true
|
||||
pod 'YYImage', :inhibit_warnings => true
|
||||
pod 'ZXingObjC', git: 'https://github.com/TheLevelUp/ZXingObjC'
|
||||
|
||||
target 'Signal' do
|
||||
shared_pods
|
||||
# Pods only available inside the main Signal app
|
||||
pod 'SSZipArchive', :inhibit_warnings => true
|
||||
pod 'SignalRingRTC', path: 'ThirdParty/SignalRingRTC.podspec', inhibit_wranings: true
|
||||
|
||||
@ -82,13 +80,9 @@ target 'Signal' do
|
||||
end
|
||||
end
|
||||
|
||||
target 'SignalShareExtension' do
|
||||
shared_pods
|
||||
end
|
||||
|
||||
target 'SignalMessaging' do
|
||||
shared_pods
|
||||
end
|
||||
# These extensions inherit all of the pods
|
||||
target 'SignalShareExtension'
|
||||
target 'SignalMessaging'
|
||||
|
||||
post_install do |installer|
|
||||
enable_extension_support_for_purelayout(installer)
|
||||
|
||||
15
Podfile.lock
15
Podfile.lock
@ -221,9 +221,14 @@ PODS:
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/View (3.1.1):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YYImage (1.0.4):
|
||||
- YYImage/Core (= 1.0.4)
|
||||
- YYImage/Core (1.0.4)
|
||||
- YYImage/WebP (1.0.4):
|
||||
- YYImage/Core
|
||||
- ZXingObjC (3.6.4):
|
||||
- ZXingObjC/All (= 3.6.4)
|
||||
- ZXingObjC/All (3.6.4)
|
||||
|
||||
DEPENDENCIES:
|
||||
- AFNetworking
|
||||
@ -252,6 +257,8 @@ DEPENDENCIES:
|
||||
- SSZipArchive
|
||||
- "Starscream (from `git@github.com:signalapp/Starscream.git`, branch `signal-release`)"
|
||||
- YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`)
|
||||
- YYImage
|
||||
- ZXingObjC (from `https://github.com/TheLevelUp/ZXingObjC`)
|
||||
|
||||
SPEC REPOS:
|
||||
https://github.com/cocoapods/specs.git:
|
||||
@ -302,6 +309,8 @@ EXTERNAL SOURCES:
|
||||
YapDatabase:
|
||||
:branch: signal-release
|
||||
:git: https://github.com/signalapp/YapDatabase.git
|
||||
ZXingObjC:
|
||||
:git: https://github.com/TheLevelUp/ZXingObjC
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
AxolotlKit:
|
||||
@ -334,6 +343,9 @@ CHECKOUT OPTIONS:
|
||||
YapDatabase:
|
||||
:commit: e43ab163b2dcb4c817339c819b07dac545f05fea
|
||||
:git: https://github.com/signalapp/YapDatabase.git
|
||||
ZXingObjC:
|
||||
:commit: cac61d5404b3ee75fca58433dd2ae825c631e4ee
|
||||
:git: https://github.com/TheLevelUp/ZXingObjC
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
|
||||
@ -362,7 +374,8 @@ SPEC CHECKSUMS:
|
||||
SwiftProtobuf: 4fd9645e69b72cbae6ec8da5be0cdd20ca6565dd
|
||||
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
|
||||
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
||||
ZXingObjC: 512b34b9b6920e8ef0461a4159d0814c5e48c28a
|
||||
|
||||
PODFILE CHECKSUM: 666e996ddd27bb935eec34e3170b68f5a6e388af
|
||||
PODFILE CHECKSUM: cdc134a62cc875be47d842da3823a3ac5e4aac7a
|
||||
|
||||
COCOAPODS: 1.7.5
|
||||
|
||||
@ -23,9 +23,6 @@ cd $PROJECT_DIR
|
||||
_osx_version=`defaults read loginwindow SystemVersionStampAsString`
|
||||
/usr/libexec/PlistBuddy -c "add :BuildDetails:OSXVersion string '$_osx_version'" Signal/Signal-Info.plist
|
||||
|
||||
_carthage_version=`carthage version`
|
||||
/usr/libexec/PlistBuddy -c "add :BuildDetails:CarthageVersion string '$_carthage_version'" Signal/Signal-Info.plist
|
||||
|
||||
echo "CONFIGURATION: ${CONFIGURATION}"
|
||||
if [ "${CONFIGURATION}" = "App Store Release" ]; then
|
||||
/usr/libexec/PlistBuddy -c "add :BuildDetails:XCodeVersion string '${XCODE_VERSION_MAJOR}.${XCODE_VERSION_MINOR}'" Signal/Signal-Info.plist
|
||||
|
||||
@ -186,7 +186,6 @@
|
||||
3496955C219B605E00DCFE74 /* ImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34969559219B605E00DCFE74 /* ImagePickerController.swift */; };
|
||||
3496955D219B605E00DCFE74 /* PhotoCollectionPickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496955A219B605E00DCFE74 /* PhotoCollectionPickerController.swift */; };
|
||||
3496955E219B605E00DCFE74 /* PhotoLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496955B219B605E00DCFE74 /* PhotoLibrary.swift */; };
|
||||
3496956021A2FC8100DCFE74 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496955F21A2FC8100DCFE74 /* CloudKit.framework */; };
|
||||
3496956E21A301A100DCFE74 /* OWSBackupExportJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 3496956221A301A100DCFE74 /* OWSBackupExportJob.m */; };
|
||||
3496956F21A301A100DCFE74 /* OWSBackupLazyRestore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496956321A301A100DCFE74 /* OWSBackupLazyRestore.swift */; };
|
||||
3496957021A301A100DCFE74 /* OWSBackupIO.m in Sources */ = {isa = PBXBuildFile; fileRef = 3496956521A301A100DCFE74 /* OWSBackupIO.m */; };
|
||||
@ -353,7 +352,6 @@
|
||||
450998651FD8A34D00D89EB3 /* DeviceSleepManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348F2EAD1F0D21BC00D4ECE0 /* DeviceSleepManager.swift */; };
|
||||
450998681FD8C0FF00D89EB3 /* AttachmentSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F83A1E8DF1700035BE1A /* AttachmentSharing.m */; };
|
||||
450998691FD8C10200D89EB3 /* AttachmentSharing.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B3F8391E8DF1700035BE1A /* AttachmentSharing.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
4509E79A1DD653700025A59F /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4509E7991DD653700025A59F /* WebRTC.framework */; };
|
||||
450C800F20AD1AB900F3A091 /* OWSWindowManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 34641E1020878FAF00E2EDE5 /* OWSWindowManager.m */; };
|
||||
450C801020AD1AE400F3A091 /* OWSWindowManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 34641E1120878FB000E2EDE5 /* OWSWindowManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
450C801220AD1D5B00F3A091 /* UIDevice+featureSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45BB93371E688E14001E3939 /* UIDevice+featureSupport.swift */; };
|
||||
@ -552,7 +550,6 @@
|
||||
4C9B4F23225025F100DD5B9A /* OWS1XXGRDBMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9B4F22225025F100DD5B9A /* OWS1XXGRDBMigration.swift */; };
|
||||
4C9C50FE22F36FA50054A33F /* OutboundMessage+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9C50FD22F36FA40054A33F /* OutboundMessage+OWS.swift */; };
|
||||
4C9C510022F495F60054A33F /* BroadcastMediaMessageJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9C50FF22F495F60054A33F /* BroadcastMediaMessageJob.swift */; };
|
||||
4C9CA25D217E676900607C63 /* ZXingObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C9CA25C217E676900607C63 /* ZXingObjC.framework */; };
|
||||
4C9D347B23679C25006A4307 /* GroupAndContactStreamTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D347923679C13006A4307 /* GroupAndContactStreamTest.swift */; };
|
||||
4C9D347F23689E06006A4307 /* IncomingContactSyncJobQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D347E23689E06006A4307 /* IncomingContactSyncJobQueue.swift */; };
|
||||
4C9D34952369EFC7006A4307 /* launchApp.json in Resources */ = {isa = PBXBuildFile; fileRef = 4C9D34942369EFC7006A4307 /* launchApp.json */; };
|
||||
@ -984,7 +981,6 @@
|
||||
34969559219B605E00DCFE74 /* ImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImagePickerController.swift; sourceTree = "<group>"; };
|
||||
3496955A219B605E00DCFE74 /* PhotoCollectionPickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoCollectionPickerController.swift; sourceTree = "<group>"; };
|
||||
3496955B219B605E00DCFE74 /* PhotoLibrary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoLibrary.swift; sourceTree = "<group>"; };
|
||||
3496955F21A2FC8100DCFE74 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
|
||||
3496956221A301A100DCFE74 /* OWSBackupExportJob.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSBackupExportJob.m; sourceTree = "<group>"; };
|
||||
3496956321A301A100DCFE74 /* OWSBackupLazyRestore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSBackupLazyRestore.swift; sourceTree = "<group>"; };
|
||||
3496956421A301A100DCFE74 /* OWSBackup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackup.h; sourceTree = "<group>"; };
|
||||
@ -1600,9 +1596,7 @@
|
||||
455A16DD1F1FEA0000F86704 /* Metal.framework in Frameworks */,
|
||||
455A16DE1F1FEA0000F86704 /* MetalKit.framework in Frameworks */,
|
||||
45847E871E4283C30080EAB3 /* Intents.framework in Frameworks */,
|
||||
4509E79A1DD653700025A59F /* WebRTC.framework in Frameworks */,
|
||||
4520D8D51D417D8E00123472 /* Photos.framework in Frameworks */,
|
||||
4C9CA25D217E676900607C63 /* ZXingObjC.framework in Frameworks */,
|
||||
B6B226971BE4B7D200860F4D /* ContactsUI.framework in Frameworks */,
|
||||
45BD60821DE9547E00A8F436 /* Contacts.framework in Frameworks */,
|
||||
B6FE7EB71ADD62FA00A6D22F /* PushKit.framework in Frameworks */,
|
||||
@ -1611,7 +1605,6 @@
|
||||
70377AAB1918450100CAF501 /* MobileCoreServices.framework in Frameworks */,
|
||||
B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */,
|
||||
453518991FC63DBF00210559 /* SignalMessaging.framework in Frameworks */,
|
||||
3496956021A2FC8100DCFE74 /* CloudKit.framework in Frameworks */,
|
||||
76C87F19181EFCE600C4ACAB /* MediaPlayer.framework in Frameworks */,
|
||||
768A1A2B17FC9CD300E00ED8 /* libz.dylib in Frameworks */,
|
||||
A11CD70D17FA230600A2D1B1 /* QuartzCore.framework in Frameworks */,
|
||||
@ -2977,7 +2970,6 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
38AD4FA92310B7E00038BA75 /* SignalRingRTC.framework */,
|
||||
3496955F21A2FC8100DCFE74 /* CloudKit.framework */,
|
||||
4C9CA25C217E676900607C63 /* ZXingObjC.framework */,
|
||||
4CC1ECF8211A47CD00CC13BE /* StoreKit.framework */,
|
||||
455A16DB1F1FEA0000F86704 /* Metal.framework */,
|
||||
@ -3185,7 +3177,6 @@
|
||||
4C10B18523176D250099396B /* Sources */,
|
||||
4C10B1A623176D250099396B /* Frameworks */,
|
||||
4C10B1B723176D250099396B /* Resources */,
|
||||
4C10B1BE23176D250099396B /* [Carthage] Copy Frameworks */,
|
||||
7357495FDBE5CE3C7ACC7E4D /* [CP] Embed Pods Frameworks */,
|
||||
);
|
||||
buildRules = (
|
||||
@ -3210,7 +3201,6 @@
|
||||
34C239432180B01B00B6108F /* Run Script: update_plist_info */,
|
||||
D221A087169C9E5E00537ABF /* Resources */,
|
||||
59C9DBA462715B5C999FFB02 /* [CP] Embed Pods Frameworks */,
|
||||
451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */,
|
||||
453518771FC635DD00210559 /* Embed App Extensions */,
|
||||
4535189F1FC63DBF00210559 /* Embed Frameworks */,
|
||||
);
|
||||
@ -3591,21 +3581,6 @@
|
||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
|
||||
);
|
||||
name = "[Carthage] Copy Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
|
||||
};
|
||||
451DE9FB1DC18D4500810E42 /* [Carthage] Copy Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@ -3634,22 +3609,6 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "if which swiftlint >/dev/null; then\n# disabled for now. too many lint errors outside of the scope of this branch\n#(cd Signal && swiftlint)\n# never fail.\nexit 0\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
|
||||
};
|
||||
4C10B1BE23176D250099396B /* [Carthage] Copy Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
|
||||
);
|
||||
name = "[Carthage] Copy Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
|
||||
};
|
||||
59C9DBA462715B5C999FFB02 /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
@ -3681,6 +3640,7 @@
|
||||
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/blurhash/blurhash.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
|
||||
@ -3711,6 +3671,7 @@
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/blurhash.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
|
||||
@ -3766,6 +3727,7 @@
|
||||
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/blurhash/blurhash.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
|
||||
@ -3793,6 +3755,7 @@
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/blurhash.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
|
||||
@ -3848,6 +3811,7 @@
|
||||
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/blurhash/blurhash.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
||||
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
|
||||
@ -3875,6 +3839,7 @@
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/blurhash.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
<dict>
|
||||
<key>BuildDetails</key>
|
||||
<dict>
|
||||
<key>CarthageVersion</key>
|
||||
<string>0.33.0</string>
|
||||
<key>OSXVersion</key>
|
||||
<string>10.15.1</string>
|
||||
<key>WebRTCCommit</key>
|
||||
|
||||
@ -473,7 +473,6 @@ NSString *NSStringForLaunchFailure(LaunchFailure launchFailure)
|
||||
OWSLogInfo(@"Build XCode Version: %@", buildDetails[@"XCodeVersion"]);
|
||||
OWSLogInfo(@"Build OS X Version: %@", buildDetails[@"OSXVersion"]);
|
||||
OWSLogInfo(@"Build Cocoapods Version: %@", buildDetails[@"CocoapodsVersion"]);
|
||||
OWSLogInfo(@"Build Carthage Version: %@", buildDetails[@"CarthageVersion"]);
|
||||
OWSLogInfo(@"Build Date/Time: %@", buildDetails[@"DateTime"]);
|
||||
|
||||
OWSLogInfo(@"Build Expires in: %ld days", (long)SSKAppExpiry.daysUntilBuildExpiry);
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
SignalServiceKit is an Objective-C library for communicating with the Signal
|
||||
messaging service for iOS & OS X
|
||||
|
||||
To use SignalServiceKit via Cocoapods add the following to your Podfile
|
||||
To use SignalServiceKit via CocoaPods add the following to your Podfile
|
||||
|
||||
pod 'SignalServiceKit', git: 'https://github.com/signalapp/Signal-iOS.git'
|
||||
|
||||
|
||||
@ -168,7 +168,7 @@ def should_ignore_path(path):
|
||||
return True
|
||||
if component.endswith('.framework'):
|
||||
return True
|
||||
if component in ('Pods', 'ThirdParty', 'Carthage',):
|
||||
if component in ('Pods', 'ThirdParty',):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
import XCTest
|
||||
|
||||
/////
|
||||
// Swift Test vs. Cocoapods issue #1
|
||||
// Swift Test vs. CocoaPods issue #1
|
||||
/////
|
||||
//
|
||||
// Cocoapods-generated test targets (like this one)
|
||||
// CocoaPods-generated test targets (like this one)
|
||||
// fail to link if:
|
||||
//
|
||||
// * They only contain Obj-C tests.
|
||||
@ -20,7 +20,7 @@ import XCTest
|
||||
// See: https://github.com/CocoaPods/CocoaPods/issues/7170
|
||||
|
||||
/////
|
||||
// Swift Test vs. Cocoapods issue #2
|
||||
// Swift Test vs. CocoaPods issue #2
|
||||
/////
|
||||
//
|
||||
// XCode's test runner doesn't copy swift framework's required by dependencies into
|
||||
|
||||
2
ThirdParty/Cartfile
vendored
2
ThirdParty/Cartfile
vendored
@ -1,2 +0,0 @@
|
||||
github "TheLevelUp/ZXingObjC"
|
||||
|
||||
1
ThirdParty/Cartfile.resolved
vendored
1
ThirdParty/Cartfile.resolved
vendored
@ -1 +0,0 @@
|
||||
github "TheLevelUp/ZXingObjC" "3.2.2"
|
||||
1
ThirdParty/Carthage
vendored
1
ThirdParty/Carthage
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 34a9f944814e26408e328f6d10597966afe7d15a
|
||||
Loading…
Reference in New Issue
Block a user