From b68e73c707d3dbad0cd221fcf5500a827b2764b5 Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Thu, 12 Nov 2020 17:30:58 -0800 Subject: [PATCH] Update pods --- Podfile | 4 ++-- Podfile.lock | 12 ++++++++---- Pods | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index 1ee61c7648..8ba481ba46 100644 --- a/Podfile +++ b/Podfile @@ -12,8 +12,8 @@ pod 'SwiftProtobuf', "1.7.0" 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"] diff --git a/Podfile.lock b/Podfile.lock index ae956ad54a..e8483fb88e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -231,8 +231,8 @@ PODS: DEPENDENCIES: - AFNetworking/NSURLSession - - AxolotlKit (from `../SignalProtocolKit`) - - AxolotlKit/Tests (from `../SignalProtocolKit`) + - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) + - AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - blurhash (from `https://github.com/signalapp/blurhash`, branch `signal-master`) - BonMot - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`) @@ -284,7 +284,8 @@ SPEC REPOS: EXTERNAL SOURCES: AxolotlKit: - :path: "../SignalProtocolKit" + :branch: master + :git: https://github.com/signalapp/SignalProtocolKit.git blurhash: :branch: signal-master :git: https://github.com/signalapp/blurhash @@ -327,6 +328,9 @@ EXTERNAL SOURCES: :git: https://github.com/zxingify/zxingify-objc.git CHECKOUT OPTIONS: + AxolotlKit: + :commit: 18a7031342824cb73e6c7d170227249d0c461a79 + :git: https://github.com/signalapp/SignalProtocolKit.git blurhash: :commit: 890ffdab14207154819415da7e6c969e9dfff0e9 :git: https://github.com/signalapp/blurhash @@ -403,6 +407,6 @@ SPEC CHECKSUMS: ZKGroup: 15a08eed5870a44b9dd14af0824ac95f6eed7380 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 2c63fe2b9f8ee738050a15a7d7204004248f35ad +PODFILE CHECKSUM: b5bfa970280627e05667d8024a4089e2f68b0e49 COCOAPODS: 1.9.2 diff --git a/Pods b/Pods index 47fb907d56..1375f1c87e 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 47fb907d5697abc1932e7e2e48d1a72a2cc7fa89 +Subproject commit 1375f1c87e5cf027963baa221db7cca7b7c923b4