SQUASHME review podfile changes

This commit is contained in:
Michael Kirk 2018-10-29 22:17:25 -06:00
parent 8544c86427
commit e09a181445
2 changed files with 13 additions and 15 deletions

View File

@ -5,7 +5,7 @@ use_frameworks!
def shared_pods
# OWS Pods
pod 'SignalCoreKit', git: 'git@github.com:signalapp/SignalCoreKit-Private.git', branch: 'mkirk/wrap-exceptions', testspecs: ["Tests"]
pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
# pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
# pod 'SQLCipher', path: '../sqlcipher2'
pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
@ -19,7 +19,7 @@ def shared_pods
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
# TODO: Use public repo.
pod 'SignalMetadataKit', git: 'git@github.com:signalapp/SignalMetadataKit', branch: 'mkirk/wrap-exceptions', testspecs: ["Tests"]
pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"]
# pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework'

View File

@ -192,10 +192,10 @@ DEPENDENCIES:
- Mantle
- PureLayout
- Reachability
- "SignalCoreKit (from `git@github.com:signalapp/SignalCoreKit-Private.git`, branch `mkirk/wrap-exceptions`)"
- "SignalCoreKit/Tests (from `git@github.com:signalapp/SignalCoreKit-Private.git`, branch `mkirk/wrap-exceptions`)"
- "SignalMetadataKit (from `git@github.com:signalapp/SignalMetadataKit`, branch `mkirk/wrap-exceptions`)"
- "SignalMetadataKit/Tests (from `git@github.com:signalapp/SignalMetadataKit`, branch `mkirk/wrap-exceptions`)"
- SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`)
- SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`)
- SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit`)
- SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit`)
- SignalServiceKit (from `.`)
- SignalServiceKit/Tests (from `.`)
- SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
@ -229,11 +229,9 @@ EXTERNAL SOURCES:
HKDFKit:
:git: https://github.com/signalapp/HKDFKit.git
SignalCoreKit:
:branch: mkirk/wrap-exceptions
:git: "git@github.com:signalapp/SignalCoreKit-Private.git"
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:branch: mkirk/wrap-exceptions
:git: "git@github.com:signalapp/SignalMetadataKit"
:git: https://github.com/signalapp/SignalMetadataKit
SignalServiceKit:
:path: "."
SocketRocket:
@ -260,11 +258,11 @@ CHECKOUT OPTIONS:
:commit: 8b8326cd50bc488663a3d3743f1a92b90f4d85b4
:git: https://github.com/signalapp/HKDFKit.git
SignalCoreKit:
:commit: df8d9528eb5e7e161ea04393a0d7972cd8539c14
:git: "git@github.com:signalapp/SignalCoreKit-Private.git"
:commit: ff0b95770520133b83a4bd7b26bc2c90b51abc4d
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:commit: 07326a8ebb8e207bbe0e08fc6cd1d4979acc83d6
:git: "git@github.com:signalapp/SignalMetadataKit"
:commit: 90f3dee7122ff13061770c496001135ba90b71e3
:git: https://github.com/signalapp/SignalMetadataKit
SocketRocket:
:commit: 9f9563a83cd8960503074aa8de72206f83fb7a69
:git: https://github.com/signalapp/SocketRocket.git
@ -298,6 +296,6 @@ SPEC CHECKSUMS:
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
PODFILE CHECKSUM: 794d0aeb047ca81b7c697f99e43b6f80ea4ce585
PODFILE CHECKSUM: 820287bc7925d7c20e02a02923976c60b1f5386b
COCOAPODS: 1.5.3