From 46ebe52a2771641c9a8d521387b50d25ef3c42fa Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 12 Nov 2018 09:40:28 -0600 Subject: [PATCH] update pods --- Podfile | 6 ++---- Podfile.lock | 13 ++++++++++--- Pods | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Podfile b/Podfile index 228be5bb6..666a2f5dc 100644 --- a/Podfile +++ b/Podfile @@ -7,18 +7,16 @@ def shared_pods # OWS Pods pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"] # pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"] - # pod 'SQLCipher', path: '../sqlcipher2' + # pod 'SQLCipher', path: '../sqlcipher' pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec' # pod 'YapDatabase/SQLCipher', path: '../YapDatabase' pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release' - # TODO: Integrate tests. - pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master' + 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 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"] # pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"] - # TODO: Use public repo. pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"] # pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"] pod 'SignalServiceKit', path: '.', testspecs: ["Tests"] diff --git a/Podfile.lock b/Podfile.lock index e284a4cd9..19721c925 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,6 +20,12 @@ PODS: - HKDFKit (~> 0.0.3) - SignalCoreKit - SwiftProtobuf + - AxolotlKit/Tests (0.9.0): + - CocoaLumberjack + - Curve25519Kit (~> 2.1.0) + - HKDFKit (~> 0.0.3) + - SignalCoreKit + - SwiftProtobuf - CocoaLumberjack (3.4.2): - CocoaLumberjack/Default (= 3.4.2) - CocoaLumberjack/Extensions (= 3.4.2) @@ -184,6 +190,7 @@ PODS: DEPENDENCIES: - AFNetworking - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) + - AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`) - Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`) - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`) @@ -246,7 +253,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: AxolotlKit: - :commit: 66b38e23b4e980cbddc94980f5bd0d1211d9184a + :commit: dedb0f987ac98c8edafc8c54d442c01589cafffb :git: https://github.com/signalapp/SignalProtocolKit.git Curve25519Kit: :commit: 9e5663baf4c2c7cb68ac4c0beb0423383c19a7fe @@ -261,7 +268,7 @@ CHECKOUT OPTIONS: :commit: b60dc7d58dfc93ca6eafbb3ea5300c6d67ebc69a :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: - :commit: d6b0186cc5b15019e85c375bce3bf78e7a7fc162 + :commit: 8a586363921b4546bea99b07c06bf5c93eab7973 :git: https://github.com/signalapp/SignalMetadataKit SocketRocket: :commit: 9f9563a83cd8960503074aa8de72206f83fb7a69 @@ -296,6 +303,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: 820287bc7925d7c20e02a02923976c60b1f5386b +PODFILE CHECKSUM: 0f765be42c3a325b23c9a59b52d35289bb6b067d COCOAPODS: 1.5.3 diff --git a/Pods b/Pods index ee79b2f16..432128c6f 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit ee79b2f1693b1dbf570030ef40dc7685754803aa +Subproject commit 432128c6fe2bb8c09467f0660108ea8b125695e1