From cc94d6946a5e34be0e594a0615b7e36b601840e4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 13:39:55 -0700 Subject: [PATCH] update pods --- Podfile | 4 ++-- Podfile.lock | 13 ++++++++----- Pods | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Podfile b/Podfile index d87aeac1f..2495e35ea 100644 --- a/Podfile +++ b/Podfile @@ -9,8 +9,8 @@ def shared_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"] diff --git a/Podfile.lock b/Podfile.lock index f8d35f79b..efec89b65 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -200,8 +200,8 @@ DEPENDENCIES: - PromiseKit (= 6.5.3) - PureLayout - Reachability - - SignalCoreKit (from `../SignalCoreKit`) - - SignalCoreKit/Tests (from `../SignalCoreKit`) + - 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 `.`) @@ -240,7 +240,7 @@ EXTERNAL SOURCES: :branch: signal-master :git: https://github.com/signalapp/Mantle SignalCoreKit: - :path: "../SignalCoreKit" + :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :git: https://github.com/signalapp/SignalMetadataKit SignalServiceKit: @@ -268,6 +268,9 @@ CHECKOUT OPTIONS: Mantle: :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :git: https://github.com/signalapp/Mantle + SignalCoreKit: + :commit: 061f41321675ffe5af5e547d578bbd2266a46d33 + :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 :git: https://github.com/signalapp/SignalMetadataKit @@ -291,7 +294,7 @@ SPEC CHECKSUMS: PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c - SignalCoreKit: 2d5db80cda950a892383a4002146ec0d81460ce1 + SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 SignalServiceKit: c637b66e485538dda76836a1ec560dc556035430 SQLCipher: 4636a257060f6f1b4e143a143028b61a2b462d0d @@ -301,6 +304,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: 15fd183a8e1c41a9df76d3cdb28f415e2d6c4ab5 +PODFILE CHECKSUM: b0748e1cca7826f2ed132c495589e6aea9b7d743 COCOAPODS: 1.5.3 diff --git a/Pods b/Pods index 434610837..4e153f47e 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 434610837e73668d186716fd2e5b8913c84ef46a +Subproject commit 4e153f47ef16d84b3256dd5d3884c708fdf0ab33