From fde19efc1386a5baccd990b659049c366b6aee84 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 29 Jul 2022 15:29:20 +1000 Subject: [PATCH] Fixed a duplicate dependency issue --- Podfile | 2 -- Podfile.lock | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Podfile b/Podfile index a8b57ea29..ae568f035 100644 --- a/Podfile +++ b/Podfile @@ -23,7 +23,6 @@ abstract_target 'GlobalDependencies' do pod 'Reachability' pod 'PureLayout', '~> 3.1.8' pod 'NVActivityIndicatorView' - pod 'YYImage', git: 'https://github.com/signalapp/YYImage' pod 'YYImage/libwebp', git: 'https://github.com/signalapp/YYImage' pod 'ZXingObjC' pod 'DifferenceKit' @@ -52,7 +51,6 @@ abstract_target 'GlobalDependencies' do pod 'Reachability' pod 'SAMKeychain' pod 'SwiftProtobuf', '~> 1.5.0' - pod 'YYImage', git: 'https://github.com/signalapp/YYImage' pod 'YYImage/libwebp', git: 'https://github.com/signalapp/YYImage' pod 'DifferenceKit' end diff --git a/Podfile.lock b/Podfile.lock index 58c3a3735..89c8650fc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -130,8 +130,6 @@ PODS: - YapDatabase/SQLCipher/Core - YapDatabase/SQLCipher/Extensions/View (3.1.1): - YapDatabase/SQLCipher/Core - - YYImage (1.0.4): - - YYImage/Core (= 1.0.4) - YYImage/Core (1.0.4) - YYImage/libwebp (1.0.4): - libwebp @@ -160,7 +158,6 @@ DEPENDENCIES: - SwiftProtobuf (~> 1.5.0) - WebRTC-lib - YapDatabase/SQLCipher (from `https://github.com/oxen-io/session-ios-yap-database.git`, branch `signal-release`) - - YYImage (from `https://github.com/signalapp/YYImage`) - YYImage/libwebp (from `https://github.com/signalapp/YYImage`) - ZXingObjC @@ -245,6 +242,6 @@ SPEC CHECKSUMS: YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 456facc7043447a9c67733cf8846ec62afff8ea8 +PODFILE CHECKSUM: f0857369c4831b2e5c1946345e76e493f3286805 COCOAPODS: 1.11.3