From 5bcaec2e21f57980c5094aa5de5ac5760968f59d Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Wed, 30 Sep 2020 14:27:18 +0300 Subject: [PATCH 1/7] carthage update. --- .gitignore | 5 ++++ Cartfile.resolved | 2 +- Carthage/Checkouts/PINCache/.buckconfig | 21 ----------------- Carthage/Checkouts/PINCache/.travis.yml | 18 --------------- Carthage/Checkouts/PINCache/BUCK | 23 ------------------- Carthage/Checkouts/PINCache/CI/build.sh | 4 ---- .../PINCache/CI/exclude-from-build.json | 6 ----- Carthage/Checkouts/PINCache/Dangerfile | 23 ------------------- Carthage/Checkouts/PINCache/Gemfile | 4 ---- Carthage/Checkouts/PINOperation/Dangerfile | 23 ------------------- Carthage/Checkouts/PINOperation/Gemfile | 4 ---- 11 files changed, 6 insertions(+), 127 deletions(-) delete mode 100644 Carthage/Checkouts/PINCache/.buckconfig delete mode 100644 Carthage/Checkouts/PINCache/.travis.yml delete mode 100755 Carthage/Checkouts/PINCache/BUCK delete mode 100755 Carthage/Checkouts/PINCache/CI/build.sh delete mode 100644 Carthage/Checkouts/PINCache/CI/exclude-from-build.json delete mode 100644 Carthage/Checkouts/PINCache/Dangerfile delete mode 100644 Carthage/Checkouts/PINCache/Gemfile delete mode 100644 Carthage/Checkouts/PINOperation/Dangerfile delete mode 100644 Carthage/Checkouts/PINOperation/Gemfile diff --git a/.gitignore b/.gitignore index 1ffe8d40..86871492 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,8 @@ xcuserdata Pods/ Carthage/Build + +## SPM +.swiftpm/ +.build/ +Package.resolved diff --git a/Cartfile.resolved b/Cartfile.resolved index 45ab11cf..e7d7bbfc 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ git "https://chromium.googlesource.com/webm/libwebp" "v1.1.0" github "pinterest/PINCache" "3.0.1" -github "pinterest/PINOperation" "1.2" +github "pinterest/PINOperation" "1.2.0" diff --git a/Carthage/Checkouts/PINCache/.buckconfig b/Carthage/Checkouts/PINCache/.buckconfig deleted file mode 100644 index 2ea97ebd..00000000 --- a/Carthage/Checkouts/PINCache/.buckconfig +++ /dev/null @@ -1,21 +0,0 @@ -[cxx] - default_platform = iphonesimulator-x86_64 - combined_preprocess_and_compile = true - -[apple] - iphonesimulator_target_sdk_version = 5.0 - iphoneos_target_sdk_version = 5.0 - macosx_target_sdk_version = 10.7 - xctool_default_destination_specifier = platform=iOS Simulator, name=iPhone 6, OS=10.2 - -[alias] - lib = //:PINCache - tests = //tests:Tests - -[project] - parallel_parsing = true - ide = xcode - ignore = .buckd, \ - .hg, \ - .git, \ - buck-out, \ diff --git a/Carthage/Checkouts/PINCache/.travis.yml b/Carthage/Checkouts/PINCache/.travis.yml deleted file mode 100644 index ef93752c..00000000 --- a/Carthage/Checkouts/PINCache/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: objective-c -osx_image: xcode7.3 -cache: - - bundler - - cocoapods -branches: - only: - - master -before_install: - - gem install cocoapods -v '0.39.0' -before_script: - - pod lib lint --verbose -env: - matrix: - - OS='8.4' name='iPhone 6' - - OS='latest' name='iPhone 6' -script: - - xcodebuild clean test -project tests/PINCache.xcodeproj -scheme PINCacheTests -sdk iphonesimulator -destination "platform=iOS Simulator,name=$name,OS=$OS" ONLY_ACTIVE_ARCH=NO diff --git a/Carthage/Checkouts/PINCache/BUCK b/Carthage/Checkouts/PINCache/BUCK deleted file mode 100755 index bbb8d2c8..00000000 --- a/Carthage/Checkouts/PINCache/BUCK +++ /dev/null @@ -1,23 +0,0 @@ -apple_library( - name = 'PINCache', - exported_headers = glob(['Source/*.h']), - # PINDiskCache.m should be compiled with '-fobjc-arc-exceptions' (#105) - srcs = - glob(['Source/*.m'], excludes = ['Source/PINDiskCache.m']) + - [('Source/PINDiskCache.m', ['-fobjc-arc-exceptions'])], - preprocessor_flags = ['-fobjc-arc'], - lang_preprocessor_flags = { - 'C': ['-std=gnu99'], - 'CXX': ['-std=gnu++11', '-stdlib=libc++'], - }, - linker_flags = [ - '-weak_framework', - 'UIKit', - '-weak_framework', - 'AppKit', - ], - frameworks = [ - '$SDKROOT/System/Library/Frameworks/Foundation.framework', - ], - visibility = ['PUBLIC'], -) diff --git a/Carthage/Checkouts/PINCache/CI/build.sh b/Carthage/Checkouts/PINCache/CI/build.sh deleted file mode 100755 index bbdb8f94..00000000 --- a/Carthage/Checkouts/PINCache/CI/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eo pipefail - -make all \ No newline at end of file diff --git a/Carthage/Checkouts/PINCache/CI/exclude-from-build.json b/Carthage/Checkouts/PINCache/CI/exclude-from-build.json deleted file mode 100644 index 28cc1627..00000000 --- a/Carthage/Checkouts/PINCache/CI/exclude-from-build.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - "^plans/", - "^docs/", - "^README.md$", - "^CI/exclude-from-build.json$" -] \ No newline at end of file diff --git a/Carthage/Checkouts/PINCache/Dangerfile b/Carthage/Checkouts/PINCache/Dangerfile deleted file mode 100644 index d909431b..00000000 --- a/Carthage/Checkouts/PINCache/Dangerfile +++ /dev/null @@ -1,23 +0,0 @@ -source_pattern = /(\.m|\.mm|\.h)$/ - -# Sometimes it's a README fix, or something like that - which isn't relevant for -# including in a project's CHANGELOG for example -declared_trivial = github.pr_title.include? "#trivial" -has_changes_in_source_directory = !git.modified_files.grep(/Source/).empty? - -modified_source_files = git.modified_files.grep(source_pattern) -has_modified_source_files = !modified_source_files.empty? -added_source_files = git.added_files.grep(source_pattern) -has_added_source_files = !added_source_files.empty? - -# Make it more obvious that a PR is a work in progress and shouldn't be merged yet -warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]" - -# Warn when there is a big PR -warn("This is a big PR, please consider splitting it up to ease code review.") if git.lines_of_code > 500 - -# Changelog entries are required for changes to source files. -no_changelog_entry = !git.modified_files.include?("CHANGELOG.md") -if has_changes_in_source_directory && no_changelog_entry && !declared_trivial - warn("Any source code changes should have an entry in CHANGELOG.md or have #trivial in their title.") -end diff --git a/Carthage/Checkouts/PINCache/Gemfile b/Carthage/Checkouts/PINCache/Gemfile deleted file mode 100644 index 38bfbc8e..00000000 --- a/Carthage/Checkouts/PINCache/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'danger' -gem 'danger-slack' \ No newline at end of file diff --git a/Carthage/Checkouts/PINOperation/Dangerfile b/Carthage/Checkouts/PINOperation/Dangerfile deleted file mode 100644 index d909431b..00000000 --- a/Carthage/Checkouts/PINOperation/Dangerfile +++ /dev/null @@ -1,23 +0,0 @@ -source_pattern = /(\.m|\.mm|\.h)$/ - -# Sometimes it's a README fix, or something like that - which isn't relevant for -# including in a project's CHANGELOG for example -declared_trivial = github.pr_title.include? "#trivial" -has_changes_in_source_directory = !git.modified_files.grep(/Source/).empty? - -modified_source_files = git.modified_files.grep(source_pattern) -has_modified_source_files = !modified_source_files.empty? -added_source_files = git.added_files.grep(source_pattern) -has_added_source_files = !added_source_files.empty? - -# Make it more obvious that a PR is a work in progress and shouldn't be merged yet -warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]" - -# Warn when there is a big PR -warn("This is a big PR, please consider splitting it up to ease code review.") if git.lines_of_code > 500 - -# Changelog entries are required for changes to source files. -no_changelog_entry = !git.modified_files.include?("CHANGELOG.md") -if has_changes_in_source_directory && no_changelog_entry && !declared_trivial - warn("Any source code changes should have an entry in CHANGELOG.md or have #trivial in their title.") -end diff --git a/Carthage/Checkouts/PINOperation/Gemfile b/Carthage/Checkouts/PINOperation/Gemfile deleted file mode 100644 index 38bfbc8e..00000000 --- a/Carthage/Checkouts/PINOperation/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'danger' -gem 'danger-slack' \ No newline at end of file From df348d3ade08fffffefd8d2876c1f037e8f3436c Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Thu, 1 Oct 2020 17:21:38 +0300 Subject: [PATCH 2/7] build! --- Package.swift | 46 +++++++++++++++++++ .../AnimatedImages/PINCachedAnimatedImage.m | 2 +- .../AnimatedImages/PINWebPAnimatedImage.m | 4 ++ .../Categories/NSData+ImageDetectors.m | 6 ++- Source/Classes/Categories/PINImage+WebP.m | 5 ++ Source/Classes/PINDisplayLink.m | 4 ++ Source/Classes/PINRemoteImageDownloadTask.h | 2 +- Source/Classes/PINRemoteImageManager.m | 2 +- Source/Classes/PINRemoteImageTask.h | 2 +- .../NSData+ImageDetectors.h | 0 .../PINAlternateRepresentationProvider.h | 0 .../PINAnimatedImage.h | 0 .../PINAnimatedImageView+PINRemoteImage.h | 2 +- .../PINAnimatedImageView.h | 2 +- .../PINButton+PINRemoteImage.h | 0 .../PINCache+PINRemoteImageCaching.h | 2 +- .../PINCachedAnimatedImage.h | 0 .../PINGIFAnimatedImage.h | 0 .../PINImageView+PINRemoteImage.h | 0 .../{ => include}/PINProgressiveImage.h | 0 Source/Classes/{ => include}/PINRemoteImage.h | 0 .../{ => include}/PINRemoteImageCaching.h | 0 .../PINRemoteImageCategoryManager.h | 0 .../{ => include}/PINRemoteImageMacros.h | 0 .../{ => include}/PINRemoteImageManager.h | 0 .../PINRemoteImageManagerResult.h | 0 .../{ => include}/PINRequestRetryStrategy.h | 0 .../{ => include}/PINURLSessionManager.h | 0 .../PINWebPAnimatedImage.h | 0 29 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 Package.swift rename Source/Classes/{Categories => include}/NSData+ImageDetectors.h (100%) rename Source/Classes/{ => include}/PINAlternateRepresentationProvider.h (100%) rename Source/Classes/{AnimatedImages => include}/PINAnimatedImage.h (100%) rename Source/Classes/{ImageCategories => include}/PINAnimatedImageView+PINRemoteImage.h (82%) rename Source/Classes/{AnimatedImages => include}/PINAnimatedImageView.h (94%) rename Source/Classes/{ImageCategories => include}/PINButton+PINRemoteImage.h (100%) rename Source/Classes/{PINCache => include}/PINCache+PINRemoteImageCaching.h (92%) rename Source/Classes/{AnimatedImages => include}/PINCachedAnimatedImage.h (100%) rename Source/Classes/{AnimatedImages => include}/PINGIFAnimatedImage.h (100%) rename Source/Classes/{ImageCategories => include}/PINImageView+PINRemoteImage.h (100%) rename Source/Classes/{ => include}/PINProgressiveImage.h (100%) rename Source/Classes/{ => include}/PINRemoteImage.h (100%) rename Source/Classes/{ => include}/PINRemoteImageCaching.h (100%) rename Source/Classes/{ => include}/PINRemoteImageCategoryManager.h (100%) rename Source/Classes/{ => include}/PINRemoteImageMacros.h (100%) rename Source/Classes/{ => include}/PINRemoteImageManager.h (100%) rename Source/Classes/{ => include}/PINRemoteImageManagerResult.h (100%) rename Source/Classes/{ => include}/PINRequestRetryStrategy.h (100%) rename Source/Classes/{ => include}/PINURLSessionManager.h (100%) rename Source/Classes/{AnimatedImages => include}/PINWebPAnimatedImage.h (100%) diff --git a/Package.swift b/Package.swift new file mode 100644 index 00000000..20a31795 --- /dev/null +++ b/Package.swift @@ -0,0 +1,46 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "PINRemoteImage", + platforms: [ + .macOS(.v10_10), + .iOS(.v9), + .tvOS(.v9) + ], + products: [ + .library( + name: "PINRemoteImage", + type: .static, + targets: ["PINRemoteImage"]), + ], + dependencies: [ + .package(url: "https://github.com/3a4oT/PINCache.git", .branch("spm")), + .package(name: "libwebp", + url: "https://github.com/SDWebImage/libwebp-Xcode", + from: "1.1.0"), + ], + targets: [ + .target( + name: "PINRemoteImage", + dependencies: ["PINCache", "libwebp"], + path: "Source/Classes", + exclude: ["Source/PINWebP", "webp", "Examples", + "Carthage", "docs", "PINRemoteImage", + "build_docs.sh", "Cartfile", + "Cartfile.resolved", "Makefile", + "PINRemoteImge.podspec", "progressive.gif"], + publicHeadersPath: "include", + cSettings: [ + .headerSearchPath("."), + .headerSearchPath("Categories"), + .headerSearchPath("AnimatedImages"), + .headerSearchPath("ImageCategories"), + .headerSearchPath("PinCache"), + .define("USE_PINCACHE", to: "1"), + .define("PIN_WEBP", to: "1"), + ]), + ] +) diff --git a/Source/Classes/AnimatedImages/PINCachedAnimatedImage.m b/Source/Classes/AnimatedImages/PINCachedAnimatedImage.m index 1b4e8070..ca91a7be 100644 --- a/Source/Classes/AnimatedImages/PINCachedAnimatedImage.m +++ b/Source/Classes/AnimatedImages/PINCachedAnimatedImage.m @@ -14,7 +14,7 @@ #import "PINWebPAnimatedImage.h" #endif -#import +@import PINOperation; #import "NSData+ImageDetectors.h" static const NSUInteger kFramesToRenderForLargeFrames = 4; diff --git a/Source/Classes/AnimatedImages/PINWebPAnimatedImage.m b/Source/Classes/AnimatedImages/PINWebPAnimatedImage.m index 32b53ba9..39d34c2d 100644 --- a/Source/Classes/AnimatedImages/PINWebPAnimatedImage.m +++ b/Source/Classes/AnimatedImages/PINWebPAnimatedImage.m @@ -12,7 +12,11 @@ #import "NSData+ImageDetectors.h" +#if SWIFT_PACKAGE +@import libwebp; +#else #import "demux.h" +#endif @interface PINWebPAnimatedImage () { diff --git a/Source/Classes/Categories/NSData+ImageDetectors.m b/Source/Classes/Categories/NSData+ImageDetectors.m index f290b88f..f58f5571 100644 --- a/Source/Classes/Categories/NSData+ImageDetectors.m +++ b/Source/Classes/Categories/NSData+ImageDetectors.m @@ -9,7 +9,11 @@ #import "NSData+ImageDetectors.h" #if PIN_WEBP -#import "webp/demux.h" + #if SWIFT_PACKAGE + @import libwebp; + #else + #import "webp/demux.h" + #endif #endif @implementation NSData (PINImageDetectors) diff --git a/Source/Classes/Categories/PINImage+WebP.m b/Source/Classes/Categories/PINImage+WebP.m index b455cddf..6fdcc588 100644 --- a/Source/Classes/Categories/PINImage+WebP.m +++ b/Source/Classes/Categories/PINImage+WebP.m @@ -9,7 +9,12 @@ #import "PINImage+WebP.h" #if PIN_WEBP + +#if SWIFT_PACKAGE +@import libwebp; +#else #import "decode.h" +#endif static void releaseData(void *info, const void *data, size_t size) { diff --git a/Source/Classes/PINDisplayLink.m b/Source/Classes/PINDisplayLink.m index 73124704..cc6e0606 100644 --- a/Source/Classes/PINDisplayLink.m +++ b/Source/Classes/PINDisplayLink.m @@ -9,6 +9,10 @@ #if PIN_TARGET_MAC +#if SWIFT_PACKAGE +@import CoreVideo.CVDisplayLink; +#endif + @interface PINDisplayLink () @property (nonatomic, readonly) id target; diff --git a/Source/Classes/PINRemoteImageDownloadTask.h b/Source/Classes/PINRemoteImageDownloadTask.h index c0364c19..9d9656d1 100644 --- a/Source/Classes/PINRemoteImageDownloadTask.h +++ b/Source/Classes/PINRemoteImageDownloadTask.h @@ -6,7 +6,7 @@ // // -#import +@import PINOperation; #import "PINRemoteImageManager+Private.h" #import "PINRemoteImageTask.h" diff --git a/Source/Classes/PINRemoteImageManager.m b/Source/Classes/PINRemoteImageManager.m index b18bc19b..109e612e 100644 --- a/Source/Classes/PINRemoteImageManager.m +++ b/Source/Classes/PINRemoteImageManager.m @@ -9,7 +9,7 @@ #import "PINRemoteImageManager.h" #import -#import +@import PINOperation; #import diff --git a/Source/Classes/PINRemoteImageTask.h b/Source/Classes/PINRemoteImageTask.h index 0fc0ed9e..a02b5633 100644 --- a/Source/Classes/PINRemoteImageTask.h +++ b/Source/Classes/PINRemoteImageTask.h @@ -7,7 +7,7 @@ // #import -#import +@import PINOperation; #import "PINRemoteImageCallbacks.h" #import "PINRemoteImageManager.h" diff --git a/Source/Classes/Categories/NSData+ImageDetectors.h b/Source/Classes/include/NSData+ImageDetectors.h similarity index 100% rename from Source/Classes/Categories/NSData+ImageDetectors.h rename to Source/Classes/include/NSData+ImageDetectors.h diff --git a/Source/Classes/PINAlternateRepresentationProvider.h b/Source/Classes/include/PINAlternateRepresentationProvider.h similarity index 100% rename from Source/Classes/PINAlternateRepresentationProvider.h rename to Source/Classes/include/PINAlternateRepresentationProvider.h diff --git a/Source/Classes/AnimatedImages/PINAnimatedImage.h b/Source/Classes/include/PINAnimatedImage.h similarity index 100% rename from Source/Classes/AnimatedImages/PINAnimatedImage.h rename to Source/Classes/include/PINAnimatedImage.h diff --git a/Source/Classes/ImageCategories/PINAnimatedImageView+PINRemoteImage.h b/Source/Classes/include/PINAnimatedImageView+PINRemoteImage.h similarity index 82% rename from Source/Classes/ImageCategories/PINAnimatedImageView+PINRemoteImage.h rename to Source/Classes/include/PINAnimatedImageView+PINRemoteImage.h index cc14a651..9dbfbc96 100644 --- a/Source/Classes/ImageCategories/PINAnimatedImageView+PINRemoteImage.h +++ b/Source/Classes/include/PINAnimatedImageView+PINRemoteImage.h @@ -5,7 +5,7 @@ // Created by Garrett Moon on 4/19/18. // -#import +#import "PINAnimatedImageView.h" #import "PINRemoteImageCategoryManager.h" diff --git a/Source/Classes/AnimatedImages/PINAnimatedImageView.h b/Source/Classes/include/PINAnimatedImageView.h similarity index 94% rename from Source/Classes/AnimatedImages/PINAnimatedImageView.h rename to Source/Classes/include/PINAnimatedImageView.h index 694e9a0f..b224f025 100644 --- a/Source/Classes/AnimatedImages/PINAnimatedImageView.h +++ b/Source/Classes/include/PINAnimatedImageView.h @@ -13,7 +13,7 @@ #import #endif -#import +#import "PINCachedAnimatedImage.h" @interface PINAnimatedImageView : PINImageView diff --git a/Source/Classes/ImageCategories/PINButton+PINRemoteImage.h b/Source/Classes/include/PINButton+PINRemoteImage.h similarity index 100% rename from Source/Classes/ImageCategories/PINButton+PINRemoteImage.h rename to Source/Classes/include/PINButton+PINRemoteImage.h diff --git a/Source/Classes/PINCache/PINCache+PINRemoteImageCaching.h b/Source/Classes/include/PINCache+PINRemoteImageCaching.h similarity index 92% rename from Source/Classes/PINCache/PINCache+PINRemoteImageCaching.h rename to Source/Classes/include/PINCache+PINRemoteImageCaching.h index 907b3525..728f0078 100644 --- a/Source/Classes/PINCache/PINCache+PINRemoteImageCaching.h +++ b/Source/Classes/include/PINCache+PINRemoteImageCaching.h @@ -6,7 +6,7 @@ // // -#import +@import PINCache; #import "PINRemoteImageCaching.h" #import "PINRemoteImageManager.h" diff --git a/Source/Classes/AnimatedImages/PINCachedAnimatedImage.h b/Source/Classes/include/PINCachedAnimatedImage.h similarity index 100% rename from Source/Classes/AnimatedImages/PINCachedAnimatedImage.h rename to Source/Classes/include/PINCachedAnimatedImage.h diff --git a/Source/Classes/AnimatedImages/PINGIFAnimatedImage.h b/Source/Classes/include/PINGIFAnimatedImage.h similarity index 100% rename from Source/Classes/AnimatedImages/PINGIFAnimatedImage.h rename to Source/Classes/include/PINGIFAnimatedImage.h diff --git a/Source/Classes/ImageCategories/PINImageView+PINRemoteImage.h b/Source/Classes/include/PINImageView+PINRemoteImage.h similarity index 100% rename from Source/Classes/ImageCategories/PINImageView+PINRemoteImage.h rename to Source/Classes/include/PINImageView+PINRemoteImage.h diff --git a/Source/Classes/PINProgressiveImage.h b/Source/Classes/include/PINProgressiveImage.h similarity index 100% rename from Source/Classes/PINProgressiveImage.h rename to Source/Classes/include/PINProgressiveImage.h diff --git a/Source/Classes/PINRemoteImage.h b/Source/Classes/include/PINRemoteImage.h similarity index 100% rename from Source/Classes/PINRemoteImage.h rename to Source/Classes/include/PINRemoteImage.h diff --git a/Source/Classes/PINRemoteImageCaching.h b/Source/Classes/include/PINRemoteImageCaching.h similarity index 100% rename from Source/Classes/PINRemoteImageCaching.h rename to Source/Classes/include/PINRemoteImageCaching.h diff --git a/Source/Classes/PINRemoteImageCategoryManager.h b/Source/Classes/include/PINRemoteImageCategoryManager.h similarity index 100% rename from Source/Classes/PINRemoteImageCategoryManager.h rename to Source/Classes/include/PINRemoteImageCategoryManager.h diff --git a/Source/Classes/PINRemoteImageMacros.h b/Source/Classes/include/PINRemoteImageMacros.h similarity index 100% rename from Source/Classes/PINRemoteImageMacros.h rename to Source/Classes/include/PINRemoteImageMacros.h diff --git a/Source/Classes/PINRemoteImageManager.h b/Source/Classes/include/PINRemoteImageManager.h similarity index 100% rename from Source/Classes/PINRemoteImageManager.h rename to Source/Classes/include/PINRemoteImageManager.h diff --git a/Source/Classes/PINRemoteImageManagerResult.h b/Source/Classes/include/PINRemoteImageManagerResult.h similarity index 100% rename from Source/Classes/PINRemoteImageManagerResult.h rename to Source/Classes/include/PINRemoteImageManagerResult.h diff --git a/Source/Classes/PINRequestRetryStrategy.h b/Source/Classes/include/PINRequestRetryStrategy.h similarity index 100% rename from Source/Classes/PINRequestRetryStrategy.h rename to Source/Classes/include/PINRequestRetryStrategy.h diff --git a/Source/Classes/PINURLSessionManager.h b/Source/Classes/include/PINURLSessionManager.h similarity index 100% rename from Source/Classes/PINURLSessionManager.h rename to Source/Classes/include/PINURLSessionManager.h diff --git a/Source/Classes/AnimatedImages/PINWebPAnimatedImage.h b/Source/Classes/include/PINWebPAnimatedImage.h similarity index 100% rename from Source/Classes/AnimatedImages/PINWebPAnimatedImage.h rename to Source/Classes/include/PINWebPAnimatedImage.h From 40f205726c339f7d225eed135545f0ce6fc3e7a7 Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Thu, 1 Oct 2020 18:00:08 +0300 Subject: [PATCH 3/7] cleanup Package.swift --- Package.swift | 6 ------ Source/Classes/include/PINRemoteImageMacros.h | 14 +++++++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 20a31795..ab4dbbda 100644 --- a/Package.swift +++ b/Package.swift @@ -27,11 +27,6 @@ let package = Package( name: "PINRemoteImage", dependencies: ["PINCache", "libwebp"], path: "Source/Classes", - exclude: ["Source/PINWebP", "webp", "Examples", - "Carthage", "docs", "PINRemoteImage", - "build_docs.sh", "Cartfile", - "Cartfile.resolved", "Makefile", - "PINRemoteImge.podspec", "progressive.gif"], publicHeadersPath: "include", cSettings: [ .headerSearchPath("."), @@ -40,7 +35,6 @@ let package = Package( .headerSearchPath("ImageCategories"), .headerSearchPath("PinCache"), .define("USE_PINCACHE", to: "1"), - .define("PIN_WEBP", to: "1"), ]), ] ) diff --git a/Source/Classes/include/PINRemoteImageMacros.h b/Source/Classes/include/PINRemoteImageMacros.h index 6d6f248d..6b1b78b6 100644 --- a/Source/Classes/include/PINRemoteImageMacros.h +++ b/Source/Classes/include/PINRemoteImageMacros.h @@ -27,10 +27,18 @@ #endif #ifndef PIN_WEBP - #if __has_include() - #define PIN_WEBP 1 + #if SWIFT_PACKAGE + #if __has_include() + #define PIN_WEBP 1 + #else + #define PIN_WEBP 0 + #endif #else - #define PIN_WEBP 0 + #if __has_include() + #define PIN_WEBP 1 + #else + #define PIN_WEBP 0 + #endif #endif #endif From 98e14be8fa9d34faf162a0a1a86ad337ede3612d Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Thu, 1 Oct 2020 18:12:45 +0300 Subject: [PATCH 4/7] repair Xcode build. --- PINRemoteImage.xcodeproj/project.pbxproj | 261 +++++++++++++---------- 1 file changed, 143 insertions(+), 118 deletions(-) diff --git a/PINRemoteImage.xcodeproj/project.pbxproj b/PINRemoteImage.xcodeproj/project.pbxproj index 9f66b0a8..f1a19c4f 100644 --- a/PINRemoteImage.xcodeproj/project.pbxproj +++ b/PINRemoteImage.xcodeproj/project.pbxproj @@ -47,20 +47,6 @@ 139D50B01F672BBF00DE64E0 /* PINRemoteImageDownloadQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 68B1F27F1E679D7A00ED87C4 /* PINRemoteImageDownloadQueue.h */; }; 139D50B11F672BBF00DE64E0 /* PINResume.h in Headers */ = {isa = PBXBuildFile; fileRef = 68B7E3B01E736C73000FC887 /* PINResume.h */; }; 139D50B21F672BBF00DE64E0 /* PINSpeedRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 6860CB061F578287005E886E /* PINSpeedRecorder.h */; }; - 139D50B41F672C1C00DE64E0 /* PINButton+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DD47F981C699F4B00F12CA0 /* PINButton+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50B51F672C1C00DE64E0 /* PINImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DD47F9A1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50B61F672C1C00DE64E0 /* NSData+ImageDetectors.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918DE1BCF23C800710963 /* NSData+ImageDetectors.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50B71F672C1C00DE64E0 /* PINCache+PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = 68CA92811DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50B81F672C1C00DE64E0 /* PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918EF1BCF23C800710963 /* PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50B91F672C1C00DE64E0 /* PINAlternateRepresentationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 68F0EA8E1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50BB1F672C1C00DE64E0 /* PINRemoteImageMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = F165DFD81BD0504A0008C6E8 /* PINRemoteImageMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50BC1F672C1C00DE64E0 /* PINProgressiveImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918ED1BCF23C800710963 /* PINProgressiveImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50BD1F672C1C00DE64E0 /* PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = 68CA927B1DAEFF93008BECE2 /* PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50BE1F672C1C00DE64E0 /* PINRemoteImageCategoryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F21BCF23C800710963 /* PINRemoteImageCategoryManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50BF1F672C1C00DE64E0 /* PINRemoteImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F51BCF23C800710963 /* PINRemoteImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50C01F672C1C00DE64E0 /* PINRemoteImageManagerResult.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F71BCF23C800710963 /* PINRemoteImageManagerResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50C11F672C1C00DE64E0 /* PINURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918FD1BCF23C800710963 /* PINURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 139D50C21F672C1C00DE64E0 /* PINRequestRetryStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 926E015C1F0DFCAE00874D01 /* PINRequestRetryStrategy.h */; settings = {ATTRIBUTES = (Public, ); }; }; 683128F51F95045200D5B4A8 /* PINAnimatedImage+PINAnimatedImageTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 683128F41F95045200D5B4A8 /* PINAnimatedImage+PINAnimatedImageTesting.m */; }; 6858C0751C9CC5BA00E420EB /* PINRemoteLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 6858C0731C9CC5BA00E420EB /* PINRemoteLock.h */; }; 6858C0761C9CC5BA00E420EB /* PINRemoteLock.m in Sources */ = {isa = PBXBuildFile; fileRef = 6858C0741C9CC5BA00E420EB /* PINRemoteLock.m */; }; @@ -68,7 +54,6 @@ 6860CB091F578287005E886E /* PINSpeedRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6860CB071F578287005E886E /* PINSpeedRecorder.m */; }; 6864A9221F6D94AF007BB848 /* PINAnimatedImageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6864A9211F6D94AF007BB848 /* PINAnimatedImageTests.swift */; }; 686D48D01ED38FC0003DB4C2 /* PINRemoteImageTask+Subclassing.h in Headers */ = {isa = PBXBuildFile; fileRef = 686D48CE1ED38FC0003DB4C2 /* PINRemoteImageTask+Subclassing.h */; }; - 687750271F6B2305008748B0 /* PINWebPAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 687750251F6B2305008748B0 /* PINWebPAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 687750281F6B2305008748B0 /* PINWebPAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 687750261F6B2305008748B0 /* PINWebPAnimatedImage.m */; }; 68912D86208FDB4900F5FE0E /* PINRemoteWeakProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 68912D84208FDB4900F5FE0E /* PINRemoteWeakProxy.h */; }; 68912D87208FDB4900F5FE0E /* PINRemoteWeakProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 68912D84208FDB4900F5FE0E /* PINRemoteWeakProxy.h */; }; @@ -76,12 +61,8 @@ 68912D89208FDB4900F5FE0E /* PINRemoteWeakProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 68912D85208FDB4900F5FE0E /* PINRemoteWeakProxy.m */; }; 689613D8208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 689613D2208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m */; }; 689613D9208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 689613D2208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m */; }; - 689613DA208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 689613D7208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 689613DB208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 689613D7208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 689613DE208FD8B700D2095C /* PINAnimatedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 689613DC208FD8B600D2095C /* PINAnimatedImageView.m */; }; 689613DF208FD8B700D2095C /* PINAnimatedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 689613DC208FD8B600D2095C /* PINAnimatedImageView.m */; }; - 689613E0208FD8B700D2095C /* PINAnimatedImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 689613DD208FD8B700D2095C /* PINAnimatedImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 689613E1208FD8B700D2095C /* PINAnimatedImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 689613DD208FD8B700D2095C /* PINAnimatedImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 689613E4208FD90B00D2095C /* PINDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 689613E2208FD90A00D2095C /* PINDisplayLink.h */; }; 689613E5208FD90B00D2095C /* PINDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 689613E2208FD90A00D2095C /* PINDisplayLink.h */; }; 689613E6208FD90B00D2095C /* PINDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 689613E3208FD90B00D2095C /* PINDisplayLink.m */; }; @@ -94,36 +75,24 @@ 68B1F2821E679D7A00ED87C4 /* PINRemoteImageDownloadQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 68B1F2801E679D7A00ED87C4 /* PINRemoteImageDownloadQueue.m */; }; 68B7E3B21E736C73000FC887 /* PINResume.h in Headers */ = {isa = PBXBuildFile; fileRef = 68B7E3B01E736C73000FC887 /* PINResume.h */; }; 68B7E3B31E736C73000FC887 /* PINResume.m in Sources */ = {isa = PBXBuildFile; fileRef = 68B7E3B11E736C73000FC887 /* PINResume.m */; }; - 68C155CB1F6EE0A20075EE40 /* PINCachedAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 68C155C91F6EE0A20075EE40 /* PINCachedAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68C155CC1F6EE0A20075EE40 /* PINCachedAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C155CA1F6EE0A20075EE40 /* PINCachedAnimatedImage.m */; }; - 68C155D61F6EE8890075EE40 /* PINAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 68C155D41F6EE8890075EE40 /* PINAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68C155D71F6EE8890075EE40 /* PINAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C155D51F6EE8890075EE40 /* PINAnimatedImage.m */; }; - 68C155DC1F6F202F0075EE40 /* PINGIFAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 68C155DA1F6F202F0075EE40 /* PINGIFAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68C155DD1F6F202F0075EE40 /* PINGIFAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C155DB1F6F202F0075EE40 /* PINGIFAnimatedImage.m */; }; 68CA927C1DAEFF93008BECE2 /* PINRemoteImageBasicCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 68CA92791DAEFF93008BECE2 /* PINRemoteImageBasicCache.h */; }; 68CA927D1DAEFF93008BECE2 /* PINRemoteImageBasicCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 68CA927A1DAEFF93008BECE2 /* PINRemoteImageBasicCache.m */; }; - 68CA927E1DAEFF93008BECE2 /* PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = 68CA927B1DAEFF93008BECE2 /* PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 68CA92831DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = 68CA92811DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68CA92841DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.m in Sources */ = {isa = PBXBuildFile; fileRef = 68CA92821DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.m */; }; - 68D734471F75FDC800B9C95D /* PINAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 68C155D41F6EE8890075EE40 /* PINAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68D7344C1F75FDCF00B9C95D /* PINAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C155D51F6EE8890075EE40 /* PINAnimatedImage.m */; }; - 68D7344D1F75FDD600B9C95D /* PINCachedAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 68C155C91F6EE0A20075EE40 /* PINCachedAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68D7344E1F75FDDB00B9C95D /* PINCachedAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C155CA1F6EE0A20075EE40 /* PINCachedAnimatedImage.m */; }; - 68D734511F75FDE500B9C95D /* PINGIFAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 68C155DA1F6F202F0075EE40 /* PINGIFAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68D734521F75FDEA00B9C95D /* PINGIFAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C155DB1F6F202F0075EE40 /* PINGIFAnimatedImage.m */; }; - 68F0EA921CB32EC900F1FD41 /* PINAlternateRepresentationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 68F0EA8E1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68F0EA931CB32EC900F1FD41 /* PINAlternateRepresentationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68F0EA8F1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.m */; }; 68F0EA941CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 68F0EA901CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.h */; }; 68F0EA951CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 68F0EA911CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.m */; }; - 926E01631F0DFEE100874D01 /* PINRequestRetryStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 926E015C1F0DFCAE00874D01 /* PINRequestRetryStrategy.h */; settings = {ATTRIBUTES = (Public, ); }; }; 926E01641F0DFEE800874D01 /* PINRequestRetryStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 926E015D1F0DFCAE00874D01 /* PINRequestRetryStrategy.m */; }; 938E98D52224775600029E4D /* PINRemoteImageManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */; }; 938E98DA2224775B00029E4D /* PINRemoteImageManagerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */; }; 939546C02220AF84006031BB /* PINRemoteImageManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */; }; 939546C12220AF84006031BB /* PINRemoteImageManagerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */; }; - 9DD47F9C1C699F4B00F12CA0 /* PINButton+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DD47F981C699F4B00F12CA0 /* PINButton+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9DD47F9D1C699F4B00F12CA0 /* PINButton+PINRemoteImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DD47F991C699F4B00F12CA0 /* PINButton+PINRemoteImage.m */; }; - 9DD47F9E1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DD47F9A1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9DD47F9F1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DD47F9B1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m */; }; 9DD47FA41C699FDC00F12CA0 /* PINImage+DecodedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DD47FA01C699FDC00F12CA0 /* PINImage+DecodedImage.h */; }; 9DD47FA51C699FDC00F12CA0 /* PINImage+DecodedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DD47FA11C699FDC00F12CA0 /* PINImage+DecodedImage.m */; }; @@ -134,30 +103,62 @@ ACD28AB87FABF6BA3B9BF4E4 /* NSDate+PINCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ACD28D963D79EEC14EE071CE /* NSDate+PINCacheTests.m */; }; D93A340224182D46005EB15E /* TestAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D93A340124182D46005EB15E /* TestAnimatedImage.m */; }; D93A340324182D46005EB15E /* TestAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D93A340124182D46005EB15E /* TestAnimatedImage.m */; }; - F165DFD91BD0504A0008C6E8 /* PINRemoteImageMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = F165DFD81BD0504A0008C6E8 /* PINRemoteImageMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B918FF1BCF23C900710963 /* PINRemoteImageCategoryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918DC1BCF23C800710963 /* PINRemoteImageCategoryManager.m */; }; - F1B919001BCF23C900710963 /* NSData+ImageDetectors.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918DE1BCF23C800710963 /* NSData+ImageDetectors.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B919011BCF23C900710963 /* NSData+ImageDetectors.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918DF1BCF23C800710963 /* NSData+ImageDetectors.m */; }; - F1B9190E1BCF23C900710963 /* PINProgressiveImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918ED1BCF23C800710963 /* PINProgressiveImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B9190F1BCF23C900710963 /* PINProgressiveImage.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918EE1BCF23C800710963 /* PINProgressiveImage.m */; }; - F1B919101BCF23C900710963 /* PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918EF1BCF23C800710963 /* PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B919111BCF23C900710963 /* PINRemoteImageCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F01BCF23C800710963 /* PINRemoteImageCallbacks.h */; }; F1B919121BCF23C900710963 /* PINRemoteImageCallbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918F11BCF23C800710963 /* PINRemoteImageCallbacks.m */; }; - F1B919131BCF23C900710963 /* PINRemoteImageCategoryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F21BCF23C800710963 /* PINRemoteImageCategoryManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B919141BCF23C900710963 /* PINRemoteImageDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F31BCF23C800710963 /* PINRemoteImageDownloadTask.h */; }; F1B919151BCF23C900710963 /* PINRemoteImageDownloadTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918F41BCF23C800710963 /* PINRemoteImageDownloadTask.m */; }; - F1B919161BCF23C900710963 /* PINRemoteImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F51BCF23C800710963 /* PINRemoteImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B919171BCF23C900710963 /* PINRemoteImageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918F61BCF23C800710963 /* PINRemoteImageManager.m */; }; - F1B919181BCF23C900710963 /* PINRemoteImageManagerResult.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F71BCF23C800710963 /* PINRemoteImageManagerResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B919191BCF23C900710963 /* PINRemoteImageManagerResult.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918F81BCF23C800710963 /* PINRemoteImageManagerResult.m */; }; F1B9191A1BCF23C900710963 /* PINRemoteImageProcessorTask.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918F91BCF23C800710963 /* PINRemoteImageProcessorTask.h */; }; F1B9191B1BCF23C900710963 /* PINRemoteImageProcessorTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918FA1BCF23C800710963 /* PINRemoteImageProcessorTask.m */; }; F1B9191C1BCF23C900710963 /* PINRemoteImageTask.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918FB1BCF23C800710963 /* PINRemoteImageTask.h */; }; F1B9191D1BCF23C900710963 /* PINRemoteImageTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918FC1BCF23C800710963 /* PINRemoteImageTask.m */; }; - F1B9191E1BCF23C900710963 /* PINURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F1B918FD1BCF23C800710963 /* PINURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; F1B9191F1BCF23C900710963 /* PINURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F1B918FE1BCF23C900710963 /* PINURLSessionManager.m */; }; F370FD6624AD0F6D0026A9D9 /* WebPDemux.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F370FD6524AD0F6D0026A9D9 /* WebPDemux.framework */; }; F370FD6924AD0F920026A9D9 /* WebPDecoder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F370FD6824AD0F920026A9D9 /* WebPDecoder.framework */; }; + FBC8209C2526277E007FD40D /* PINURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820812526277E007FD40D /* PINURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC8209D2526277E007FD40D /* PINURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820812526277E007FD40D /* PINURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC8209E2526277E007FD40D /* PINRemoteImageCategoryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820822526277E007FD40D /* PINRemoteImageCategoryManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC8209F2526277E007FD40D /* PINRemoteImageCategoryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820822526277E007FD40D /* PINRemoteImageCategoryManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A02526277E007FD40D /* PINAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820832526277E007FD40D /* PINAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A12526277E007FD40D /* PINAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820832526277E007FD40D /* PINAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A22526277E007FD40D /* PINProgressiveImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820842526277E007FD40D /* PINProgressiveImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A32526277E007FD40D /* PINProgressiveImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820842526277E007FD40D /* PINProgressiveImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A42526277E007FD40D /* PINRequestRetryStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820852526277E007FD40D /* PINRequestRetryStrategy.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A52526277E007FD40D /* PINRequestRetryStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820852526277E007FD40D /* PINRequestRetryStrategy.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A62526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820862526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A72526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820862526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A82526277E007FD40D /* PINCache+PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820872526277E007FD40D /* PINCache+PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820A92526277E007FD40D /* PINCache+PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820872526277E007FD40D /* PINCache+PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820AA2526277E007FD40D /* PINAnimatedImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820882526277E007FD40D /* PINAnimatedImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820AB2526277E007FD40D /* PINAnimatedImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820882526277E007FD40D /* PINAnimatedImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820AC2526277E007FD40D /* PINWebPAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820892526277E007FD40D /* PINWebPAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820AD2526277E007FD40D /* PINWebPAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820892526277E007FD40D /* PINWebPAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820AE2526277E007FD40D /* PINGIFAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208A2526277E007FD40D /* PINGIFAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820AF2526277E007FD40D /* PINGIFAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208A2526277E007FD40D /* PINGIFAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B02526277E007FD40D /* PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208B2526277E007FD40D /* PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B12526277E007FD40D /* PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208B2526277E007FD40D /* PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B22526277E007FD40D /* PINRemoteImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208C2526277E007FD40D /* PINRemoteImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B32526277E007FD40D /* PINRemoteImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208C2526277E007FD40D /* PINRemoteImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B42526277E007FD40D /* PINAlternateRepresentationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208D2526277E007FD40D /* PINAlternateRepresentationProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B52526277E007FD40D /* PINAlternateRepresentationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208D2526277E007FD40D /* PINAlternateRepresentationProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B62526277E007FD40D /* NSData+ImageDetectors.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208E2526277E007FD40D /* NSData+ImageDetectors.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B72526277E007FD40D /* NSData+ImageDetectors.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208E2526277E007FD40D /* NSData+ImageDetectors.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B82526277E007FD40D /* PINRemoteImageMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208F2526277E007FD40D /* PINRemoteImageMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820B92526277E007FD40D /* PINRemoteImageMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC8208F2526277E007FD40D /* PINRemoteImageMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820BA2526277E007FD40D /* PINButton+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820902526277E007FD40D /* PINButton+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820BB2526277E007FD40D /* PINButton+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820902526277E007FD40D /* PINButton+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820BC2526277E007FD40D /* PINRemoteImageManagerResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820912526277E007FD40D /* PINRemoteImageManagerResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820BD2526277E007FD40D /* PINRemoteImageManagerResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820912526277E007FD40D /* PINRemoteImageManagerResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820BE2526277E007FD40D /* PINImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820922526277E007FD40D /* PINImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820BF2526277E007FD40D /* PINImageView+PINRemoteImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820922526277E007FD40D /* PINImageView+PINRemoteImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820C02526277E007FD40D /* PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820932526277E007FD40D /* PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820C12526277E007FD40D /* PINRemoteImageCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820932526277E007FD40D /* PINRemoteImageCaching.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820C22526277E007FD40D /* PINCachedAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820942526277E007FD40D /* PINCachedAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FBC820C32526277E007FD40D /* PINCachedAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = FBC820942526277E007FD40D /* PINCachedAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -231,6 +232,13 @@ remoteGlobalIDString = F1B918D01BCF239200710963; remoteInfo = "PINRemoteImage-iOS"; }; + FBC8209A2526277E007FD40D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6818C2AE1E564FF900875DB7 /* PINCache.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 320117A124444DF7004FD783; + remoteInfo = "PINCache-watchOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -271,15 +279,12 @@ 6864A9201F6D94AF007BB848 /* PINRemoteImageTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PINRemoteImageTests-Bridging-Header.h"; sourceTree = ""; }; 6864A9211F6D94AF007BB848 /* PINAnimatedImageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PINAnimatedImageTests.swift; sourceTree = ""; }; 686D48CE1ED38FC0003DB4C2 /* PINRemoteImageTask+Subclassing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINRemoteImageTask+Subclassing.h"; sourceTree = ""; }; - 687750251F6B2305008748B0 /* PINWebPAnimatedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINWebPAnimatedImage.h; sourceTree = ""; }; 687750261F6B2305008748B0 /* PINWebPAnimatedImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINWebPAnimatedImage.m; sourceTree = ""; }; 687D3FC81E5650790027B131 /* PINOperation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PINOperation.framework; path = "Carthage/Checkouts/PINCache/Carthage/Checkouts/PINOperation/build/Debug-iphoneos/PINOperation.framework"; sourceTree = ""; }; 68912D84208FDB4900F5FE0E /* PINRemoteWeakProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINRemoteWeakProxy.h; sourceTree = ""; }; 68912D85208FDB4900F5FE0E /* PINRemoteWeakProxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINRemoteWeakProxy.m; sourceTree = ""; }; 689613D2208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PINAnimatedImageView+PINRemoteImage.m"; sourceTree = ""; }; - 689613D7208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINAnimatedImageView+PINRemoteImage.h"; sourceTree = ""; }; 689613DC208FD8B600D2095C /* PINAnimatedImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINAnimatedImageView.m; sourceTree = ""; }; - 689613DD208FD8B700D2095C /* PINAnimatedImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINAnimatedImageView.h; sourceTree = ""; }; 689613E2208FD90A00D2095C /* PINDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINDisplayLink.h; sourceTree = ""; }; 689613E3208FD90B00D2095C /* PINDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINDisplayLink.m; sourceTree = ""; }; 68A0FC191E523434000B552D /* PINRemoteImageTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PINRemoteImageTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -291,28 +296,19 @@ 68B1F2801E679D7A00ED87C4 /* PINRemoteImageDownloadQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageDownloadQueue.m; sourceTree = ""; }; 68B7E3B01E736C73000FC887 /* PINResume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINResume.h; sourceTree = ""; }; 68B7E3B11E736C73000FC887 /* PINResume.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINResume.m; sourceTree = ""; }; - 68C155C91F6EE0A20075EE40 /* PINCachedAnimatedImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINCachedAnimatedImage.h; sourceTree = ""; }; 68C155CA1F6EE0A20075EE40 /* PINCachedAnimatedImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINCachedAnimatedImage.m; sourceTree = ""; }; - 68C155D41F6EE8890075EE40 /* PINAnimatedImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINAnimatedImage.h; sourceTree = ""; }; 68C155D51F6EE8890075EE40 /* PINAnimatedImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINAnimatedImage.m; sourceTree = ""; }; - 68C155DA1F6F202F0075EE40 /* PINGIFAnimatedImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINGIFAnimatedImage.h; sourceTree = ""; }; 68C155DB1F6F202F0075EE40 /* PINGIFAnimatedImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINGIFAnimatedImage.m; sourceTree = ""; }; 68CA92791DAEFF93008BECE2 /* PINRemoteImageBasicCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageBasicCache.h; sourceTree = ""; }; 68CA927A1DAEFF93008BECE2 /* PINRemoteImageBasicCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageBasicCache.m; sourceTree = ""; }; - 68CA927B1DAEFF93008BECE2 /* PINRemoteImageCaching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageCaching.h; sourceTree = ""; }; - 68CA92811DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "PINCache+PINRemoteImageCaching.h"; path = "PINCache/PINCache+PINRemoteImageCaching.h"; sourceTree = ""; }; 68CA92821DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "PINCache+PINRemoteImageCaching.m"; path = "PINCache/PINCache+PINRemoteImageCaching.m"; sourceTree = ""; }; - 68F0EA8E1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINAlternateRepresentationProvider.h; sourceTree = ""; }; 68F0EA8F1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINAlternateRepresentationProvider.m; sourceTree = ""; }; 68F0EA901CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageMemoryContainer.h; sourceTree = ""; }; 68F0EA911CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageMemoryContainer.m; sourceTree = ""; }; - 926E015C1F0DFCAE00874D01 /* PINRequestRetryStrategy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINRequestRetryStrategy.h; sourceTree = ""; }; 926E015D1F0DFCAE00874D01 /* PINRequestRetryStrategy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINRequestRetryStrategy.m; sourceTree = ""; }; 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageManagerConfiguration.h; sourceTree = ""; }; 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageManagerConfiguration.m; sourceTree = ""; }; - 9DD47F981C699F4B00F12CA0 /* PINButton+PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINButton+PINRemoteImage.h"; sourceTree = ""; }; 9DD47F991C699F4B00F12CA0 /* PINButton+PINRemoteImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PINButton+PINRemoteImage.m"; sourceTree = ""; }; - 9DD47F9A1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINImageView+PINRemoteImage.h"; sourceTree = ""; }; 9DD47F9B1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PINImageView+PINRemoteImage.m"; sourceTree = ""; }; 9DD47FA01C699FDC00F12CA0 /* PINImage+DecodedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINImage+DecodedImage.h"; sourceTree = ""; }; 9DD47FA11C699FDC00F12CA0 /* PINImage+DecodedImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PINImage+DecodedImage.m"; sourceTree = ""; }; @@ -324,33 +320,45 @@ ACD28EAE81695DDF84BB76B8 /* NSHTTPURLResponse+MaxAge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSHTTPURLResponse+MaxAge.m"; sourceTree = ""; }; D93A340024182D46005EB15E /* TestAnimatedImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAnimatedImage.h; sourceTree = ""; }; D93A340124182D46005EB15E /* TestAnimatedImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAnimatedImage.m; sourceTree = ""; }; - F165DFD81BD0504A0008C6E8 /* PINRemoteImageMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageMacros.h; sourceTree = ""; }; F1B918D11BCF239200710963 /* PINRemoteImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PINRemoteImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F1B918D61BCF239200710963 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F1B918DC1BCF23C800710963 /* PINRemoteImageCategoryManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageCategoryManager.m; sourceTree = ""; }; - F1B918DE1BCF23C800710963 /* NSData+ImageDetectors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+ImageDetectors.h"; sourceTree = ""; }; F1B918DF1BCF23C800710963 /* NSData+ImageDetectors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+ImageDetectors.m"; sourceTree = ""; }; - F1B918ED1BCF23C800710963 /* PINProgressiveImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINProgressiveImage.h; sourceTree = ""; }; F1B918EE1BCF23C800710963 /* PINProgressiveImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINProgressiveImage.m; sourceTree = ""; }; - F1B918EF1BCF23C800710963 /* PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImage.h; sourceTree = ""; }; F1B918F01BCF23C800710963 /* PINRemoteImageCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageCallbacks.h; sourceTree = ""; }; F1B918F11BCF23C800710963 /* PINRemoteImageCallbacks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageCallbacks.m; sourceTree = ""; }; - F1B918F21BCF23C800710963 /* PINRemoteImageCategoryManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageCategoryManager.h; sourceTree = ""; }; F1B918F31BCF23C800710963 /* PINRemoteImageDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageDownloadTask.h; sourceTree = ""; }; F1B918F41BCF23C800710963 /* PINRemoteImageDownloadTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageDownloadTask.m; sourceTree = ""; }; - F1B918F51BCF23C800710963 /* PINRemoteImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageManager.h; sourceTree = ""; }; F1B918F61BCF23C800710963 /* PINRemoteImageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageManager.m; sourceTree = ""; }; - F1B918F71BCF23C800710963 /* PINRemoteImageManagerResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageManagerResult.h; sourceTree = ""; }; F1B918F81BCF23C800710963 /* PINRemoteImageManagerResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageManagerResult.m; sourceTree = ""; }; F1B918F91BCF23C800710963 /* PINRemoteImageProcessorTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageProcessorTask.h; sourceTree = ""; }; F1B918FA1BCF23C800710963 /* PINRemoteImageProcessorTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageProcessorTask.m; sourceTree = ""; }; F1B918FB1BCF23C800710963 /* PINRemoteImageTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageTask.h; sourceTree = ""; }; F1B918FC1BCF23C800710963 /* PINRemoteImageTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINRemoteImageTask.m; sourceTree = ""; }; - F1B918FD1BCF23C800710963 /* PINURLSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINURLSessionManager.h; sourceTree = ""; }; F1B918FE1BCF23C900710963 /* PINURLSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PINURLSessionManager.m; sourceTree = ""; }; F1E3658B1BE04112003BF022 /* PINRemoteImage.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = PINRemoteImage.modulemap; sourceTree = ""; }; F370FD6524AD0F6D0026A9D9 /* WebPDemux.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebPDemux.framework; path = webp/WebPDemux.framework; sourceTree = ""; }; F370FD6824AD0F920026A9D9 /* WebPDecoder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebPDecoder.framework; path = webp/WebPDecoder.framework; sourceTree = ""; }; + FBC820812526277E007FD40D /* PINURLSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINURLSessionManager.h; sourceTree = ""; }; + FBC820822526277E007FD40D /* PINRemoteImageCategoryManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageCategoryManager.h; sourceTree = ""; }; + FBC820832526277E007FD40D /* PINAnimatedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINAnimatedImage.h; sourceTree = ""; }; + FBC820842526277E007FD40D /* PINProgressiveImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINProgressiveImage.h; sourceTree = ""; }; + FBC820852526277E007FD40D /* PINRequestRetryStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRequestRetryStrategy.h; sourceTree = ""; }; + FBC820862526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINAnimatedImageView+PINRemoteImage.h"; sourceTree = ""; }; + FBC820872526277E007FD40D /* PINCache+PINRemoteImageCaching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINCache+PINRemoteImageCaching.h"; sourceTree = ""; }; + FBC820882526277E007FD40D /* PINAnimatedImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINAnimatedImageView.h; sourceTree = ""; }; + FBC820892526277E007FD40D /* PINWebPAnimatedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINWebPAnimatedImage.h; sourceTree = ""; }; + FBC8208A2526277E007FD40D /* PINGIFAnimatedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINGIFAnimatedImage.h; sourceTree = ""; }; + FBC8208B2526277E007FD40D /* PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImage.h; sourceTree = ""; }; + FBC8208C2526277E007FD40D /* PINRemoteImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageManager.h; sourceTree = ""; }; + FBC8208D2526277E007FD40D /* PINAlternateRepresentationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINAlternateRepresentationProvider.h; sourceTree = ""; }; + FBC8208E2526277E007FD40D /* NSData+ImageDetectors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+ImageDetectors.h"; sourceTree = ""; }; + FBC8208F2526277E007FD40D /* PINRemoteImageMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageMacros.h; sourceTree = ""; }; + FBC820902526277E007FD40D /* PINButton+PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINButton+PINRemoteImage.h"; sourceTree = ""; }; + FBC820912526277E007FD40D /* PINRemoteImageManagerResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageManagerResult.h; sourceTree = ""; }; + FBC820922526277E007FD40D /* PINImageView+PINRemoteImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PINImageView+PINRemoteImage.h"; sourceTree = ""; }; + FBC820932526277E007FD40D /* PINRemoteImageCaching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINRemoteImageCaching.h; sourceTree = ""; }; + FBC820942526277E007FD40D /* PINCachedAnimatedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PINCachedAnimatedImage.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -410,6 +418,7 @@ 6818C2BE1E564FF900875DB7 /* PINCache-tvOSTests.xctest */, 6818C2C01E564FF900875DB7 /* PINCache.framework */, 6818C2C21E564FF900875DB7 /* PINCache-macOSTests.xctest */, + FBC8209B2526277E007FD40D /* PINCache.framework */, ); name = Products; sourceTree = ""; @@ -435,15 +444,10 @@ 68C155D21F6EE3450075EE40 /* AnimatedImages */ = { isa = PBXGroup; children = ( - 68C155D41F6EE8890075EE40 /* PINAnimatedImage.h */, 68C155D51F6EE8890075EE40 /* PINAnimatedImage.m */, - 689613DD208FD8B700D2095C /* PINAnimatedImageView.h */, 689613DC208FD8B600D2095C /* PINAnimatedImageView.m */, - 68C155C91F6EE0A20075EE40 /* PINCachedAnimatedImage.h */, 68C155CA1F6EE0A20075EE40 /* PINCachedAnimatedImage.m */, - 687750251F6B2305008748B0 /* PINWebPAnimatedImage.h */, 687750261F6B2305008748B0 /* PINWebPAnimatedImage.m */, - 68C155DA1F6F202F0075EE40 /* PINGIFAnimatedImage.h */, 68C155DB1F6F202F0075EE40 /* PINGIFAnimatedImage.m */, ); path = AnimatedImages; @@ -459,7 +463,6 @@ 68CA92801DB19C06008BECE2 /* PINCache */ = { isa = PBXGroup; children = ( - 68CA92811DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.h */, 68CA92821DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.m */, ); name = PINCache; @@ -477,7 +480,6 @@ CC4243F61E62051900FD6517 /* Categories */ = { isa = PBXGroup; children = ( - F1B918DE1BCF23C800710963 /* NSData+ImageDetectors.h */, F1B918DF1BCF23C800710963 /* NSData+ImageDetectors.m */, ); path = Categories; @@ -486,28 +488,19 @@ F165DFD61BD021E30008C6E8 /* Public */ = { isa = PBXGroup; children = ( + FBC820802526277E007FD40D /* include */, 68C155D21F6EE3450075EE40 /* AnimatedImages */, F1B918E41BCF23C800710963 /* ImageCategories */, CC4243F61E62051900FD6517 /* Categories */, 68CA92801DB19C06008BECE2 /* PINCache */, - F1B918EF1BCF23C800710963 /* PINRemoteImage.h */, - 68F0EA8E1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.h */, 68F0EA8F1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.m */, - F165DFD81BD0504A0008C6E8 /* PINRemoteImageMacros.h */, - F1B918ED1BCF23C800710963 /* PINProgressiveImage.h */, F1B918EE1BCF23C800710963 /* PINProgressiveImage.m */, - 68CA927B1DAEFF93008BECE2 /* PINRemoteImageCaching.h */, - F1B918F21BCF23C800710963 /* PINRemoteImageCategoryManager.h */, F1B918DC1BCF23C800710963 /* PINRemoteImageCategoryManager.m */, - F1B918F51BCF23C800710963 /* PINRemoteImageManager.h */, F1B918F61BCF23C800710963 /* PINRemoteImageManager.m */, 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */, 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */, - F1B918F71BCF23C800710963 /* PINRemoteImageManagerResult.h */, F1B918F81BCF23C800710963 /* PINRemoteImageManagerResult.m */, - F1B918FD1BCF23C800710963 /* PINURLSessionManager.h */, F1B918FE1BCF23C900710963 /* PINURLSessionManager.m */, - 926E015C1F0DFCAE00874D01 /* PINRequestRetryStrategy.h */, 926E015D1F0DFCAE00874D01 /* PINRequestRetryStrategy.m */, ); name = Public; @@ -602,16 +595,40 @@ F1B918E41BCF23C800710963 /* ImageCategories */ = { isa = PBXGroup; children = ( - 689613D7208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h */, 689613D2208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m */, - 9DD47F981C699F4B00F12CA0 /* PINButton+PINRemoteImage.h */, 9DD47F991C699F4B00F12CA0 /* PINButton+PINRemoteImage.m */, - 9DD47F9A1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.h */, 9DD47F9B1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m */, ); path = ImageCategories; sourceTree = ""; }; + FBC820802526277E007FD40D /* include */ = { + isa = PBXGroup; + children = ( + FBC820812526277E007FD40D /* PINURLSessionManager.h */, + FBC820822526277E007FD40D /* PINRemoteImageCategoryManager.h */, + FBC820832526277E007FD40D /* PINAnimatedImage.h */, + FBC820842526277E007FD40D /* PINProgressiveImage.h */, + FBC820852526277E007FD40D /* PINRequestRetryStrategy.h */, + FBC820862526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h */, + FBC820872526277E007FD40D /* PINCache+PINRemoteImageCaching.h */, + FBC820882526277E007FD40D /* PINAnimatedImageView.h */, + FBC820892526277E007FD40D /* PINWebPAnimatedImage.h */, + FBC8208A2526277E007FD40D /* PINGIFAnimatedImage.h */, + FBC8208B2526277E007FD40D /* PINRemoteImage.h */, + FBC8208C2526277E007FD40D /* PINRemoteImageManager.h */, + FBC8208D2526277E007FD40D /* PINAlternateRepresentationProvider.h */, + FBC8208E2526277E007FD40D /* NSData+ImageDetectors.h */, + FBC8208F2526277E007FD40D /* PINRemoteImageMacros.h */, + FBC820902526277E007FD40D /* PINButton+PINRemoteImage.h */, + FBC820912526277E007FD40D /* PINRemoteImageManagerResult.h */, + FBC820922526277E007FD40D /* PINImageView+PINRemoteImage.h */, + FBC820932526277E007FD40D /* PINRemoteImageCaching.h */, + FBC820942526277E007FD40D /* PINCachedAnimatedImage.h */, + ); + path = include; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -619,21 +636,19 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 139D50B41F672C1C00DE64E0 /* PINButton+PINRemoteImage.h in Headers */, - 139D50B51F672C1C00DE64E0 /* PINImageView+PINRemoteImage.h in Headers */, - 139D50B61F672C1C00DE64E0 /* NSData+ImageDetectors.h in Headers */, - 139D50B71F672C1C00DE64E0 /* PINCache+PINRemoteImageCaching.h in Headers */, - 139D50B81F672C1C00DE64E0 /* PINRemoteImage.h in Headers */, - 139D50B91F672C1C00DE64E0 /* PINAlternateRepresentationProvider.h in Headers */, - 139D50BB1F672C1C00DE64E0 /* PINRemoteImageMacros.h in Headers */, - 139D50BC1F672C1C00DE64E0 /* PINProgressiveImage.h in Headers */, - 139D50BD1F672C1C00DE64E0 /* PINRemoteImageCaching.h in Headers */, - 139D50BE1F672C1C00DE64E0 /* PINRemoteImageCategoryManager.h in Headers */, - 139D50BF1F672C1C00DE64E0 /* PINRemoteImageManager.h in Headers */, - 139D50C01F672C1C00DE64E0 /* PINRemoteImageManagerResult.h in Headers */, - 139D50C11F672C1C00DE64E0 /* PINURLSessionManager.h in Headers */, - 139D50C21F672C1C00DE64E0 /* PINRequestRetryStrategy.h in Headers */, + FBC820AB2526277E007FD40D /* PINAnimatedImageView.h in Headers */, + FBC820B12526277E007FD40D /* PINRemoteImage.h in Headers */, + FBC820B72526277E007FD40D /* NSData+ImageDetectors.h in Headers */, + FBC820AF2526277E007FD40D /* PINGIFAnimatedImage.h in Headers */, + FBC820B32526277E007FD40D /* PINRemoteImageManager.h in Headers */, + FBC8209D2526277E007FD40D /* PINURLSessionManager.h in Headers */, + FBC820A12526277E007FD40D /* PINAnimatedImage.h in Headers */, + FBC820BB2526277E007FD40D /* PINButton+PINRemoteImage.h in Headers */, + FBC820BF2526277E007FD40D /* PINImageView+PINRemoteImage.h in Headers */, + FBC820BD2526277E007FD40D /* PINRemoteImageManagerResult.h in Headers */, 139D50A31F672BBF00DE64E0 /* PINImage+ScaledImage.h in Headers */, + FBC8209F2526277E007FD40D /* PINRemoteImageCategoryManager.h in Headers */, + FBC820C12526277E007FD40D /* PINRemoteImageCaching.h in Headers */, 139D50A41F672BBF00DE64E0 /* PINImage+DecodedImage.h in Headers */, 139D50A51F672BBF00DE64E0 /* PINImage+WebP.h in Headers */, 139D50A71F672BBF00DE64E0 /* PINRemoteImageTask+Subclassing.h in Headers */, @@ -641,20 +656,23 @@ 938E98D52224775600029E4D /* PINRemoteImageManagerConfiguration.h in Headers */, 139D50AA1F672BBF00DE64E0 /* PINRemoteImageDownloadTask.h in Headers */, 139D50AB1F672BBF00DE64E0 /* PINRemoteImageProcessorTask.h in Headers */, + FBC820AD2526277E007FD40D /* PINWebPAnimatedImage.h in Headers */, + FBC820A92526277E007FD40D /* PINCache+PINRemoteImageCaching.h in Headers */, 139D50AC1F672BBF00DE64E0 /* PINRemoteImageTask.h in Headers */, - 68D734471F75FDC800B9C95D /* PINAnimatedImage.h in Headers */, 139D50AD1F672BBF00DE64E0 /* PINRemoteLock.h in Headers */, 139D50AE1F672BBF00DE64E0 /* PINRemoteImageMemoryContainer.h in Headers */, 139D50AF1F672BBF00DE64E0 /* PINRemoteImageBasicCache.h in Headers */, + FBC820B52526277E007FD40D /* PINAlternateRepresentationProvider.h in Headers */, + FBC820A32526277E007FD40D /* PINProgressiveImage.h in Headers */, + FBC820C32526277E007FD40D /* PINCachedAnimatedImage.h in Headers */, + FBC820B92526277E007FD40D /* PINRemoteImageMacros.h in Headers */, 139D50B01F672BBF00DE64E0 /* PINRemoteImageDownloadQueue.h in Headers */, 139D50B11F672BBF00DE64E0 /* PINResume.h in Headers */, 139D50B21F672BBF00DE64E0 /* PINSpeedRecorder.h in Headers */, 68912D87208FDB4900F5FE0E /* PINRemoteWeakProxy.h in Headers */, 689613E5208FD90B00D2095C /* PINDisplayLink.h in Headers */, - 689613E1208FD8B700D2095C /* PINAnimatedImageView.h in Headers */, - 68D7344D1F75FDD600B9C95D /* PINCachedAnimatedImage.h in Headers */, - 68D734511F75FDE500B9C95D /* PINGIFAnimatedImage.h in Headers */, - 689613DB208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h in Headers */, + FBC820A52526277E007FD40D /* PINRequestRetryStrategy.h in Headers */, + FBC820A72526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -664,40 +682,40 @@ files = ( 9DD47FA61C699FDC00F12CA0 /* PINImage+WebP.h in Headers */, 68B7E3B21E736C73000FC887 /* PINResume.h in Headers */, - F1B919131BCF23C900710963 /* PINRemoteImageCategoryManager.h in Headers */, - F1B919161BCF23C900710963 /* PINRemoteImageManager.h in Headers */, 6860CB081F578287005E886E /* PINSpeedRecorder.h in Headers */, 68912D86208FDB4900F5FE0E /* PINRemoteWeakProxy.h in Headers */, - 9DD47F9E1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.h in Headers */, - 68CA92831DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.h in Headers */, - 9DD47F9C1C699F4B00F12CA0 /* PINButton+PINRemoteImage.h in Headers */, - F165DFD91BD0504A0008C6E8 /* PINRemoteImageMacros.h in Headers */, + FBC820AA2526277E007FD40D /* PINAnimatedImageView.h in Headers */, + FBC820B42526277E007FD40D /* PINAlternateRepresentationProvider.h in Headers */, + FBC820A82526277E007FD40D /* PINCache+PINRemoteImageCaching.h in Headers */, + FBC820C22526277E007FD40D /* PINCachedAnimatedImage.h in Headers */, 68B1F2811E679D7A00ED87C4 /* PINRemoteImageDownloadQueue.h in Headers */, - 68CA927E1DAEFF93008BECE2 /* PINRemoteImageCaching.h in Headers */, + FBC8209C2526277E007FD40D /* PINURLSessionManager.h in Headers */, 68F0EA941CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.h in Headers */, - 68C155DC1F6F202F0075EE40 /* PINGIFAnimatedImage.h in Headers */, - 68F0EA921CB32EC900F1FD41 /* PINAlternateRepresentationProvider.h in Headers */, F1B9191C1BCF23C900710963 /* PINRemoteImageTask.h in Headers */, - F1B919101BCF23C900710963 /* PINRemoteImage.h in Headers */, - 926E01631F0DFEE100874D01 /* PINRequestRetryStrategy.h in Headers */, 686D48D01ED38FC0003DB4C2 /* PINRemoteImageTask+Subclassing.h in Headers */, - F1B919001BCF23C900710963 /* NSData+ImageDetectors.h in Headers */, - F1B9191E1BCF23C900710963 /* PINURLSessionManager.h in Headers */, + FBC820B22526277E007FD40D /* PINRemoteImageManager.h in Headers */, + FBC820A62526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h in Headers */, + FBC820A22526277E007FD40D /* PINProgressiveImage.h in Headers */, 939546C02220AF84006031BB /* PINRemoteImageManagerConfiguration.h in Headers */, - 689613E0208FD8B700D2095C /* PINAnimatedImageView.h in Headers */, - 687750271F6B2305008748B0 /* PINWebPAnimatedImage.h in Headers */, - 689613DA208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.h in Headers */, - 68C155CB1F6EE0A20075EE40 /* PINCachedAnimatedImage.h in Headers */, + FBC820BA2526277E007FD40D /* PINButton+PINRemoteImage.h in Headers */, + FBC820B82526277E007FD40D /* PINRemoteImageMacros.h in Headers */, + FBC820AE2526277E007FD40D /* PINGIFAnimatedImage.h in Headers */, + FBC8209E2526277E007FD40D /* PINRemoteImageCategoryManager.h in Headers */, + FBC820B62526277E007FD40D /* NSData+ImageDetectors.h in Headers */, F1B919111BCF23C900710963 /* PINRemoteImageCallbacks.h in Headers */, - F1B9190E1BCF23C900710963 /* PINProgressiveImage.h in Headers */, + FBC820BC2526277E007FD40D /* PINRemoteImageManagerResult.h in Headers */, + FBC820A02526277E007FD40D /* PINAnimatedImage.h in Headers */, + FBC820BE2526277E007FD40D /* PINImageView+PINRemoteImage.h in Headers */, 6858C0751C9CC5BA00E420EB /* PINRemoteLock.h in Headers */, 68A6B1DC1E5248BF003A92D1 /* PINImage+ScaledImage.h in Headers */, - 68C155D61F6EE8890075EE40 /* PINAnimatedImage.h in Headers */, - F1B919181BCF23C900710963 /* PINRemoteImageManagerResult.h in Headers */, + FBC820AC2526277E007FD40D /* PINWebPAnimatedImage.h in Headers */, + FBC820C02526277E007FD40D /* PINRemoteImageCaching.h in Headers */, 689613E4208FD90B00D2095C /* PINDisplayLink.h in Headers */, F1B9191A1BCF23C900710963 /* PINRemoteImageProcessorTask.h in Headers */, 9DD47FA41C699FDC00F12CA0 /* PINImage+DecodedImage.h in Headers */, + FBC820B02526277E007FD40D /* PINRemoteImage.h in Headers */, 68CA927C1DAEFF93008BECE2 /* PINRemoteImageBasicCache.h in Headers */, + FBC820A42526277E007FD40D /* PINRequestRetryStrategy.h in Headers */, F1B919141BCF23C900710963 /* PINRemoteImageDownloadTask.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -877,6 +895,13 @@ remoteRef = 6818C2C11E564FF900875DB7 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + FBC8209B2526277E007FD40D /* PINCache.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = PINCache.framework; + remoteRef = FBC8209A2526277E007FD40D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ From ceef896649562e3116e38c4f7400419804fab831 Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Thu, 1 Oct 2020 19:49:32 +0300 Subject: [PATCH 5/7] update makefile --- .github/workflows/ci.yaml | 17 +++++++++++++---- Makefile | 7 +++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7242d7a0..2fd78eda 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,7 @@ jobs: matrix: platform: ['iOS Simulator,name=iPhone 8'] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Analyze run: make analyze test: @@ -28,20 +28,29 @@ jobs: matrix: platform: ['iOS Simulator,name=iPhone 8'] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Test run: make test cocoapods: name: CocoaPods runs-on: macOS-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: CocoaPods run: make cocoapods carthage: name: Carthage runs-on: macOS-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Carthage run: make carthage + swift-package-manager: + runs-on: macos-latest + env: + DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Verify that PINRemoteImage can be build by SPM + run: make spm diff --git a/Makefile b/Makefile index b6ebd8ba..3f33e62c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PLATFORM="platform=iOS Simulator,name=iPhone 8" SDK="iphonesimulator" SHELL=/bin/bash -o pipefail -.PHONY: all webp cocoapods test carthage analyze +.PHONY: all webp cocoapods test carthage analyze spm cocoapods: pod lib lint @@ -28,5 +28,8 @@ carthage: webp: carthage update --no-use-binaries --no-build cd webp && ../Carthage/Checkouts/libwebp/iosbuild.sh + +spm: + swift build -all: carthage test cocoapods analyze \ No newline at end of file +all: carthage test cocoapods analyze spm \ No newline at end of file From dcb9fda1fe2bc61c8b81696f7c5fa558e918dc3d Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Fri, 2 Oct 2020 00:16:02 +0300 Subject: [PATCH 6/7] fixed podspec after SPM related changes. PIN xcode version on CI for Carthage and SPM jobs --- .github/workflows/ci.yaml | 2 ++ PINRemoteImage.podspec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2fd78eda..b3dbbda7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,6 +41,8 @@ jobs: carthage: name: Carthage runs-on: macOS-latest + env: + DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer steps: - uses: actions/checkout@v2 - name: Carthage diff --git a/PINRemoteImage.podspec b/PINRemoteImage.podspec index becd0851..fbe8e337 100644 --- a/PINRemoteImage.podspec +++ b/PINRemoteImage.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| cs.osx.deployment_target = osx_deployment cs.source_files = 'Source/Classes/**/*.{h,m}' cs.public_header_files = 'Source/Classes/**/*.h' - cs.exclude_files = 'Source/Classes/PINCache/*.{h,m}' + cs.exclude_files = 'Source/Classes/PINCache/*.{h,m}', 'Source/Classes/include/PINCache+PINRemoteImageCaching.h' cs.frameworks = 'ImageIO', 'Accelerate' end @@ -75,7 +75,7 @@ Pod::Spec.new do |s| pc.ios.deployment_target = ios_deployment pc.tvos.deployment_target = tvos_deployment pc.osx.deployment_target = osx_deployment - pc.source_files = 'Source/Classes/PINCache/*.{h,m}' + pc.source_files = 'Source/Classes/PINCache/*.{h,m}', 'Source/Classes/include/PINCache+PINRemoteImageCaching.h' end end From 96ba0b90d2832ee19a37f613fa4e3ffd37732129 Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Tue, 6 Oct 2020 21:21:27 +0300 Subject: [PATCH 7/7] fixed Xcode SPM integration --- Package.swift | 1 + Source/Classes/include/PINRemoteImageMacros.h | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Package.swift b/Package.swift index ab4dbbda..28786897 100644 --- a/Package.swift +++ b/Package.swift @@ -35,6 +35,7 @@ let package = Package( .headerSearchPath("ImageCategories"), .headerSearchPath("PinCache"), .define("USE_PINCACHE", to: "1"), + .define("PIN_WEBP", to: "1"), ]), ] ) diff --git a/Source/Classes/include/PINRemoteImageMacros.h b/Source/Classes/include/PINRemoteImageMacros.h index 6b1b78b6..6d6f248d 100644 --- a/Source/Classes/include/PINRemoteImageMacros.h +++ b/Source/Classes/include/PINRemoteImageMacros.h @@ -27,18 +27,10 @@ #endif #ifndef PIN_WEBP - #if SWIFT_PACKAGE - #if __has_include() - #define PIN_WEBP 1 - #else - #define PIN_WEBP 0 - #endif + #if __has_include() + #define PIN_WEBP 1 #else - #if __has_include() - #define PIN_WEBP 1 - #else - #define PIN_WEBP 0 - #endif + #define PIN_WEBP 0 #endif #endif