From 2fe5b54ffb88e9261713196e964dea70040cddaa Mon Sep 17 00:00:00 2001 From: Ehren Kret Date: Thu, 18 Apr 2024 09:21:46 -0500 Subject: [PATCH] switch to upstream blurhash --- Podfile | 4 +--- Podfile.lock | 9 ++++----- Pods | 2 +- ThirdParty/blurhash.podspec | 13 +++++++++++++ 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 ThirdParty/blurhash.podspec diff --git a/Podfile b/Podfile index f57bb5b041..078fe4b942 100644 --- a/Podfile +++ b/Podfile @@ -8,6 +8,7 @@ use_frameworks! source 'https://cdn.cocoapods.org/' +pod 'blurhash', podspec: './ThirdParty/blurhash.podspec' pod 'SwiftProtobuf', ">= 1.14.0" pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit', testspecs: ["Tests"] @@ -17,9 +18,6 @@ ENV['LIBSIGNAL_FFI_PREBUILD_CHECKSUM'] = 'efa1ba4cef14c220714fbc657bd104b5c01df0 pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git', tag: 'v0.44.0', testspecs: ["Tests"] # pod 'LibSignalClient', path: '../libsignal-client', testspecs: ["Tests"] -pod 'blurhash', git: 'https://github.com/signalapp/blurhash', branch: 'signal-master' -# pod 'blurhash', path: '../blurhash' - ENV['RINGRTC_PREBUILD_CHECKSUM'] = '8d2875193ea2f08382adc4b48c2a5e6898d7077d2b19e037a377b0a32f489d7c' pod 'SignalRingRTC', git: 'https://github.com/signalapp/ringrtc', tag: 'v2.39.3', inhibit_warnings: true # pod 'SignalRingRTC', path: '../ringrtc', testspecs: ["Tests"] diff --git a/Podfile.lock b/Podfile.lock index 7b722dc737..2a90e11f51 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -65,7 +65,7 @@ PODS: - YYImage/Core DEPENDENCIES: - - blurhash (from `https://github.com/signalapp/blurhash`, branch `signal-master`) + - blurhash (from `./ThirdParty/blurhash.podspec`) - BonMot - CocoaLumberjack - GRDB.swift/SQLCipher @@ -105,8 +105,7 @@ SPEC REPOS: EXTERNAL SOURCES: blurhash: - :branch: signal-master - :git: https://github.com/signalapp/blurhash + :podspec: "./ThirdParty/blurhash.podspec" LibMobileCoin: :commit: 345c49113e5d92e152517f17b605c9b8aef06dca :git: https://github.com/signalapp/libmobilecoin-ios-artifacts @@ -178,7 +177,7 @@ CHECKOUT OPTIONS: :git: https://github.com/signalapp/YYImage SPEC CHECKSUMS: - blurhash: 4b3b2b8909cf41ab59fa349788654b8387284ff4 + blurhash: f588a9d659f4c742a325bbbbd438d1ef3c34af19 BonMot: fb2b6a2209cb3149aca37b7131d49c051c04ae86 CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646 GRDB.swift: 1395cb3556df6b16ed69dfc74c3886abc75d2825 @@ -201,6 +200,6 @@ SPEC CHECKSUMS: Wire: f5fe13fcad476bfd248f23a45a2004167c0ebae2 YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331 -PODFILE CHECKSUM: 4cbfb4f3b865ec42529f34ecb02eb2f7efdd38e0 +PODFILE CHECKSUM: e801eb7dd476e7fdd7e818cbfd3bc5ba5592b9d0 COCOAPODS: 1.15.2 diff --git a/Pods b/Pods index 28c6fc6441..c24bef6ca0 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 28c6fc64416a8b03f0057e80d11aa501d104269b +Subproject commit c24bef6ca0169e373c1d96d0fe51b4282478948b diff --git a/ThirdParty/blurhash.podspec b/ThirdParty/blurhash.podspec new file mode 100644 index 0000000000..da4d25742a --- /dev/null +++ b/ThirdParty/blurhash.podspec @@ -0,0 +1,13 @@ +Pod::Spec.new do |s| + s.name = "blurhash" + s.version = "0.0.1" + s.summary = "A very compact representation of a placeholder for an image." + s.description = "A pure-Swift library for generating and decoding very compact image placeholders." + s.homepage = "https://github.com/woltapp/blurhash" + s.license = { :type => "MIT", :file => "Swift/License.txt" } + s.author = { "Dag Ă…gren" => "paracelsus@gmail.com" } + s.social_media_url = "https://github.com/woltapp" + s.swift_versions = ["5"] + s.source = { :git => "https://github.com/woltapp/blurhash.git", :commit => "0a1f97898d9eb8952bc528cd7a8ec73d9fecf5d0" } + s.source_files = "Swift/*.swift" +end