Move ZXingObjC & SwiftCSV to CocoaPods
This commit is contained in:
parent
afed65caea
commit
056ec0349a
2
Podfile
2
Podfile
|
@ -62,6 +62,8 @@ def shared_pods
|
||||||
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
|
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
|
||||||
pod 'Reachability', :inhibit_warnings => true
|
pod 'Reachability', :inhibit_warnings => true
|
||||||
pod 'YYImage', :inhibit_warnings => true
|
pod 'YYImage', :inhibit_warnings => true
|
||||||
|
pod 'ZXingObjC', '~> 3.6.4', :inhibit_warnings => true
|
||||||
|
pod 'SwiftCSV', '~> 0.5.6', :inhibit_warnings => true
|
||||||
end
|
end
|
||||||
|
|
||||||
target 'Signal' do
|
target 'Signal' do
|
||||||
|
|
12
Podfile.lock
12
Podfile.lock
|
@ -129,6 +129,7 @@ PODS:
|
||||||
- SQLCipher/common
|
- SQLCipher/common
|
||||||
- SSZipArchive (2.2.3)
|
- SSZipArchive (2.2.3)
|
||||||
- Starscream (3.0.6)
|
- Starscream (3.0.6)
|
||||||
|
- SwiftCSV (0.5.6)
|
||||||
- SwiftProtobuf (1.5.0)
|
- SwiftProtobuf (1.5.0)
|
||||||
- YapDatabase/SQLCipher (3.1.1):
|
- YapDatabase/SQLCipher (3.1.1):
|
||||||
- YapDatabase/SQLCipher/Core (= 3.1.1)
|
- YapDatabase/SQLCipher/Core (= 3.1.1)
|
||||||
|
@ -195,6 +196,9 @@ PODS:
|
||||||
- YYImage (1.0.4):
|
- YYImage (1.0.4):
|
||||||
- YYImage/Core (= 1.0.4)
|
- YYImage/Core (= 1.0.4)
|
||||||
- YYImage/Core (1.0.4)
|
- YYImage/Core (1.0.4)
|
||||||
|
- ZXingObjC (3.6.5):
|
||||||
|
- ZXingObjC/All (= 3.6.5)
|
||||||
|
- ZXingObjC/All (3.6.5)
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- AFNetworking (~> 3.2.1)
|
- AFNetworking (~> 3.2.1)
|
||||||
|
@ -222,8 +226,10 @@ DEPENDENCIES:
|
||||||
- SQLCipher (>= 4.0.1)
|
- SQLCipher (>= 4.0.1)
|
||||||
- SSZipArchive
|
- SSZipArchive
|
||||||
- Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`)
|
- Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`)
|
||||||
|
- SwiftCSV (~> 0.5.6)
|
||||||
- YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`)
|
- YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`)
|
||||||
- YYImage
|
- YYImage
|
||||||
|
- ZXingObjC (~> 3.6.4)
|
||||||
|
|
||||||
SPEC REPOS:
|
SPEC REPOS:
|
||||||
https://github.com/CocoaPods/Specs.git:
|
https://github.com/CocoaPods/Specs.git:
|
||||||
|
@ -240,8 +246,10 @@ SPEC REPOS:
|
||||||
- SAMKeychain
|
- SAMKeychain
|
||||||
- SQLCipher
|
- SQLCipher
|
||||||
- SSZipArchive
|
- SSZipArchive
|
||||||
|
- SwiftCSV
|
||||||
- SwiftProtobuf
|
- SwiftProtobuf
|
||||||
- YYImage
|
- YYImage
|
||||||
|
- ZXingObjC
|
||||||
|
|
||||||
EXTERNAL SOURCES:
|
EXTERNAL SOURCES:
|
||||||
GRKOpenSSLFramework:
|
GRKOpenSSLFramework:
|
||||||
|
@ -321,10 +329,12 @@ SPEC CHECKSUMS:
|
||||||
SQLCipher: e434ed542b24f38ea7b36468a13f9765e1b5c072
|
SQLCipher: e434ed542b24f38ea7b36468a13f9765e1b5c072
|
||||||
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
|
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
|
||||||
Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9
|
Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9
|
||||||
|
SwiftCSV: efb4a15dd7f2f1212b3d6986f97a3369ff6c5100
|
||||||
SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
|
SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
|
||||||
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
|
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
|
||||||
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
||||||
|
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
||||||
|
|
||||||
PODFILE CHECKSUM: b4f88816a817cc27f499940c644c0449ef5d7cc7
|
PODFILE CHECKSUM: 8803b27f35a08849d8e3e6595c88b62522a16ae7
|
||||||
|
|
||||||
COCOAPODS: 1.9.3
|
COCOAPODS: 1.9.3
|
||||||
|
|
|
@ -3340,8 +3340,6 @@
|
||||||
);
|
);
|
||||||
inputPaths = (
|
inputPaths = (
|
||||||
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
|
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
|
||||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
|
|
||||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/SwiftCSV.framework",
|
|
||||||
);
|
);
|
||||||
name = "[Carthage] Copy Frameworks";
|
name = "[Carthage] Copy Frameworks";
|
||||||
outputPaths = (
|
outputPaths = (
|
||||||
|
@ -3357,7 +3355,6 @@
|
||||||
);
|
);
|
||||||
inputPaths = (
|
inputPaths = (
|
||||||
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
|
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
|
||||||
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
|
|
||||||
);
|
);
|
||||||
name = "[Carthage] Copy Frameworks";
|
name = "[Carthage] Copy Frameworks";
|
||||||
outputPaths = (
|
outputPaths = (
|
||||||
|
@ -3416,9 +3413,11 @@
|
||||||
"${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework",
|
"${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework",
|
"${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
|
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
|
||||||
|
"${BUILT_PRODUCTS_DIR}/SwiftCSV/SwiftCSV.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
||||||
|
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
||||||
);
|
);
|
||||||
name = "[CP] Embed Pods Frameworks";
|
name = "[CP] Embed Pods Frameworks";
|
||||||
|
@ -3444,9 +3443,11 @@
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
|
||||||
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftCSV.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
||||||
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
@ -3496,9 +3497,11 @@
|
||||||
"${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework",
|
"${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework",
|
"${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
|
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
|
||||||
|
"${BUILT_PRODUCTS_DIR}/SwiftCSV/SwiftCSV.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
|
||||||
|
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
|
||||||
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
|
||||||
);
|
);
|
||||||
name = "[CP] Embed Pods Frameworks";
|
name = "[CP] Embed Pods Frameworks";
|
||||||
|
@ -3520,9 +3523,11 @@
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
|
||||||
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftCSV.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
|
||||||
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
|
Loading…
Reference in New Issue