diff --git a/Podfile b/Podfile index 04e9c5d9d0..0a3c4012ee 100644 --- a/Podfile +++ b/Podfile @@ -21,10 +21,10 @@ pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', bra 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', git: 'ssh://git@github.com/signalapp/Curve25519Kit-Private', testspecs: ["Tests"], branch: 'feature/SignalClient-adoption' # pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"] -pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"] +pod 'SignalMetadataKit', git: 'ssh://git@github.com/signalapp/SignalMetadataKit-Private', testspecs: ["Tests"], branch: 'feature/SignalClient-adoption' # pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"] pod 'blurhash', git: 'https://github.com/signalapp/blurhash', branch: 'signal-master' diff --git a/Podfile.lock b/Podfile.lock index 35c3ea5c0d..3570ae49ee 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -25,9 +25,11 @@ PODS: - CocoaLumberjack/Core (3.7.0) - Curve25519Kit (2.1.0): - CocoaLumberjack + - SignalClient - SignalCoreKit - Curve25519Kit/Tests (2.1.0): - CocoaLumberjack + - SignalClient - SignalCoreKit - GRDB.swift/SQLCipher (4.3.0): - SQLCipher (>= 3.4.0) @@ -241,8 +243,8 @@ DEPENDENCIES: - 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`) - - Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`) + - "Curve25519Kit (from `ssh://git@github.com/signalapp/Curve25519Kit-Private`, branch `feature/SignalClient-adoption`)" + - "Curve25519Kit/Tests (from `ssh://git@github.com/signalapp/Curve25519Kit-Private`, branch `feature/SignalClient-adoption`)" - GRDB.swift/SQLCipher - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`, branch `mkirk/1.0.2t`) - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`) @@ -259,8 +261,8 @@ DEPENDENCIES: - SignalClient/Tests (from `https://github.com/signalapp/libsignal-client.git`) - 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`) + - "SignalMetadataKit (from `ssh://git@github.com/signalapp/SignalMetadataKit-Private`, branch `feature/SignalClient-adoption`)" + - "SignalMetadataKit/Tests (from `ssh://git@github.com/signalapp/SignalMetadataKit-Private`, branch `feature/SignalClient-adoption`)" - SignalRingRTC (from `ThirdParty/SignalRingRTC.podspec`) - SignalServiceKit (from `.`) - SignalServiceKit/Tests (from `.`) @@ -298,7 +300,8 @@ EXTERNAL SOURCES: :branch: signal-master :git: https://github.com/signalapp/blurhash Curve25519Kit: - :git: https://github.com/signalapp/Curve25519Kit + :branch: feature/SignalClient-adoption + :git: "ssh://git@github.com/signalapp/Curve25519Kit-Private" GRKOpenSSLFramework: :branch: mkirk/1.0.2t :git: https://github.com/signalapp/GRKOpenSSLFramework @@ -318,7 +321,8 @@ EXTERNAL SOURCES: SignalCoreKit: :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: - :git: https://github.com/signalapp/SignalMetadataKit + :branch: feature/SignalClient-adoption + :git: "ssh://git@github.com/signalapp/SignalMetadataKit-Private" SignalRingRTC: :inhibit_wranings: true :path: ThirdParty/SignalRingRTC.podspec @@ -345,8 +349,8 @@ CHECKOUT OPTIONS: :commit: 890ffdab14207154819415da7e6c969e9dfff0e9 :git: https://github.com/signalapp/blurhash Curve25519Kit: - :commit: 4fc1c10e98fff2534b5379a9bb587430fdb8e577 - :git: https://github.com/signalapp/Curve25519Kit + :commit: 40d77fd50fdc44fad66426f846d783c1f24a1d43 + :git: "ssh://git@github.com/signalapp/Curve25519Kit-Private" GRKOpenSSLFramework: :commit: 4d9944de35ed56a95879c5a8a1b410ae03f71d57 :git: https://github.com/signalapp/GRKOpenSSLFramework @@ -370,8 +374,8 @@ CHECKOUT OPTIONS: :commit: 21c092e94b307690957b50f2305e5e65d28fa89e :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: - :commit: 7addcc1c4bb837b3ad44a05f72bf18ad8869b30c - :git: https://github.com/signalapp/SignalMetadataKit + :commit: 50fbd4fd21b9181d9f810447dedcec87409526ca + :git: "ssh://git@github.com/signalapp/SignalMetadataKit-Private" Starscream: :commit: b09ea163c3cb305152c65b299cb024610f52e735 :git: https://github.com/signalapp/Starscream.git @@ -394,7 +398,7 @@ SPEC CHECKSUMS: blurhash: 4b3b2b8909cf41ab59fa349788654b8387284ff4 BonMot: 2217a66e5ddc6a8d2ffb759fe8c85a8528e0d3e7 CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5 - Curve25519Kit: e63f9859ede02438ae3defc5e1a87e09d1ec7ee6 + Curve25519Kit: 4b6cddbe2d44be0ccb37e15ba719a145edab8aff GRDB.swift: 083ec261ce573888d8ed2eae1b49bc0bf40d9e2c GRKOpenSSLFramework: 4abc733a8fcbc37060619a86a54202d2938dd70e HKDFKit: bd6b9566654253aa45ef60a205979ec291f00641 @@ -421,6 +425,6 @@ SPEC CHECKSUMS: ZKGroup: 15a08eed5870a44b9dd14af0824ac95f6eed7380 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: eb662fdd6e861ad08b82532a379e1236363d933b +PODFILE CHECKSUM: 52c1be916555b10b233c6b3e5b67ccfa7e3b8bfb COCOAPODS: 1.9.2 diff --git a/Pods b/Pods index 0d95769381..d6ca7eb5ff 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 0d95769381e09217e353a278ae03a4a81c7f3338 +Subproject commit d6ca7eb5ffb54ec068643f3ab09c976aca206ca3