diff --git a/Podfile b/Podfile index 1f6c9b5eb4..dbe4fbe552 100644 --- a/Podfile +++ b/Podfile @@ -20,7 +20,7 @@ pod 'SignalClient', git: 'https://github.com/signalapp/libsignal-client.git', te pod 'Curve25519Kit', git: 'ssh://git@github.com/signalapp/Curve25519Kit', testspecs: ["Tests"], branch: 'feature/SignalClient-adoption' # pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"] -pod 'SignalMetadataKit', git: 'ssh://git@github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"], branch: 'feature/SignalClient-adoption' +pod 'SignalMetadataKit', git: 'ssh://git@github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"] # 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 61087c92b9..e1421ec581 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -231,8 +231,8 @@ DEPENDENCIES: - SignalClient/Tests (from `https://github.com/signalapp/libsignal-client.git`) - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit`) - SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit`) - - "SignalMetadataKit (from `ssh://git@github.com/signalapp/SignalMetadataKit`, branch `feature/SignalClient-adoption`)" - - "SignalMetadataKit/Tests (from `ssh://git@github.com/signalapp/SignalMetadataKit`, branch `feature/SignalClient-adoption`)" + - "SignalMetadataKit (from `ssh://git@github.com/signalapp/SignalMetadataKit`)" + - "SignalMetadataKit/Tests (from `ssh://git@github.com/signalapp/SignalMetadataKit`)" - SignalRingRTC (from `ThirdParty/SignalRingRTC.podspec`) - SignalServiceKit (from `.`) - SignalServiceKit/Tests (from `.`) @@ -309,7 +309,6 @@ EXTERNAL SOURCES: SignalCoreKit: :git: https://github.com/signalapp/SignalCoreKit SignalMetadataKit: - :branch: feature/SignalClient-adoption :git: "ssh://git@github.com/signalapp/SignalMetadataKit" SignalRingRTC: :path: ThirdParty/SignalRingRTC.podspec @@ -356,7 +355,7 @@ CHECKOUT OPTIONS: :commit: 5f3b598b21c1a5ee9a1fa88b1b86e49840b8a8b7 :git: https://github.com/signalapp/SignalCoreKit SignalMetadataKit: - :commit: 4c8ddf0b04afd179f00d7b024b1c611e3ddd2b7d + :commit: 998b7619701edf1ed4c0ad19641132d47f8dc0fc :git: "ssh://git@github.com/signalapp/SignalMetadataKit" Starscream: :commit: b09ea163c3cb305152c65b299cb024610f52e735 @@ -418,6 +417,6 @@ SPEC CHECKSUMS: YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331 ZKGroup: 81ba58bf87b5614b03d49364db221390bf257dd7 -PODFILE CHECKSUM: 340de2536cbdebd21aa649d12b8f71ad1009633c +PODFILE CHECKSUM: 1a2f55ee4705ac1727ab85aed9c2bedb50547223 COCOAPODS: 1.10.1 diff --git a/Pods b/Pods index 111c4cfeac..68b7d36036 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 111c4cfeacfa2ac3375e68b588cddb2a705acae4 +Subproject commit 68b7d36036f479f2ec7d67c97d46e6e9cd003682