Skip to content

Fix SPM support #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
woxtu wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix SPM support #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1ff272
Put headers back where they were
woxtu Nov 19, 2020
fd995d1
Create the public headers directory
woxtu Nov 19, 2020
cf655c7
Change the public headers path
woxtu Nov 19, 2020
0a4ce72
Add missing imports
woxtu Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PINRemoteImage.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Pod::Spec.new do |s|
cs.tvos.deployment_target = tvos_deployment
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}', 'Source/Classes/include/PINCache+PINRemoteImageCaching.h'
cs.public_header_files = 'Source/Classes/include/**/*.h'
cs.exclude_files = 'Source/Classes/PINCache/*.{h,m}', 'Source/Classes/include/PINRemoteImage/PINCache+PINRemoteImageCaching.h'
cs.frameworks = 'ImageIO', 'Accelerate'
end

Expand Down Expand Up @@ -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}', 'Source/Classes/include/PINCache+PINRemoteImageCaching.h'
pc.source_files = 'Source/Classes/PINCache/*.{h,m}', 'Source/Classes/include/PINRemoteImage/PINCache+PINRemoteImageCaching.h'
end

end
56 changes: 24 additions & 32 deletions PINRemoteImage.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,16 @@
68C155D21F6EE3450075EE40 /* AnimatedImages */ = {
isa = PBXGroup;
children = (
FBC820832526277E007FD40D /* PINAnimatedImage.h */,
68C155D51F6EE8890075EE40 /* PINAnimatedImage.m */,
FBC820882526277E007FD40D /* PINAnimatedImageView.h */,
689613DC208FD8B600D2095C /* PINAnimatedImageView.m */,
FBC820942526277E007FD40D /* PINCachedAnimatedImage.h */,
68C155CA1F6EE0A20075EE40 /* PINCachedAnimatedImage.m */,
687750261F6B2305008748B0 /* PINWebPAnimatedImage.m */,
FBC8208A2526277E007FD40D /* PINGIFAnimatedImage.h */,
68C155DB1F6F202F0075EE40 /* PINGIFAnimatedImage.m */,
FBC820892526277E007FD40D /* PINWebPAnimatedImage.h */,
687750261F6B2305008748B0 /* PINWebPAnimatedImage.m */,
);
path = AnimatedImages;
sourceTree = "<group>";
Expand All @@ -401,6 +406,7 @@
68CA92801DB19C06008BECE2 /* PINCache */ = {
isa = PBXGroup;
children = (
FBC820872526277E007FD40D /* PINCache+PINRemoteImageCaching.h */,
68CA92821DB19C20008BECE2 /* PINCache+PINRemoteImageCaching.m */,
);
name = PINCache;
Expand All @@ -418,6 +424,7 @@
CC4243F61E62051900FD6517 /* Categories */ = {
isa = PBXGroup;
children = (
FBC8208E2526277E007FD40D /* NSData+ImageDetectors.h */,
F1B918DF1BCF23C800710963 /* NSData+ImageDetectors.m */,
);
path = Categories;
Expand All @@ -426,20 +433,29 @@
F165DFD61BD021E30008C6E8 /* Public */ = {
isa = PBXGroup;
children = (
FBC820802526277E007FD40D /* include */,
68C155D21F6EE3450075EE40 /* AnimatedImages */,
F1B918E41BCF23C800710963 /* ImageCategories */,
CC4243F61E62051900FD6517 /* Categories */,
68CA92801DB19C06008BECE2 /* PINCache */,
F1B918E41BCF23C800710963 /* ImageCategories */,
FBC8208D2526277E007FD40D /* PINAlternateRepresentationProvider.h */,
68F0EA8F1CB32EC900F1FD41 /* PINAlternateRepresentationProvider.m */,
68CA92801DB19C06008BECE2 /* PINCache */,
FBC820842526277E007FD40D /* PINProgressiveImage.h */,
F1B918EE1BCF23C800710963 /* PINProgressiveImage.m */,
FBC8208B2526277E007FD40D /* PINRemoteImage.h */,
FBC820932526277E007FD40D /* PINRemoteImageCaching.h */,
FBC820822526277E007FD40D /* PINRemoteImageCategoryManager.h */,
F1B918DC1BCF23C800710963 /* PINRemoteImageCategoryManager.m */,
FBC8208F2526277E007FD40D /* PINRemoteImageMacros.h */,
FBC8208C2526277E007FD40D /* PINRemoteImageManager.h */,
F1B918F61BCF23C800710963 /* PINRemoteImageManager.m */,
939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */,
939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */,
FBC820912526277E007FD40D /* PINRemoteImageManagerResult.h */,
F1B918F81BCF23C800710963 /* PINRemoteImageManagerResult.m */,
F1B918FE1BCF23C900710963 /* PINURLSessionManager.m */,
FBC820852526277E007FD40D /* PINRequestRetryStrategy.h */,
926E015D1F0DFCAE00874D01 /* PINRequestRetryStrategy.m */,
FBC820812526277E007FD40D /* PINURLSessionManager.h */,
F1B918FE1BCF23C900710963 /* PINURLSessionManager.m */,
);
name = Public;
path = Classes;
Expand Down Expand Up @@ -532,40 +548,16 @@
F1B918E41BCF23C800710963 /* ImageCategories */ = {
isa = PBXGroup;
children = (
FBC820862526277E007FD40D /* PINAnimatedImageView+PINRemoteImage.h */,
689613D2208FD89900D2095C /* PINAnimatedImageView+PINRemoteImage.m */,
FBC820902526277E007FD40D /* PINButton+PINRemoteImage.h */,
9DD47F991C699F4B00F12CA0 /* PINButton+PINRemoteImage.m */,
FBC820922526277E007FD40D /* PINImageView+PINRemoteImage.h */,
9DD47F9B1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m */,
);
path = ImageCategories;
sourceTree = "<group>";
};
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 = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down
0 Source/Classes/include/PINAnimatedImage.h → ...Classes/AnimatedImages/PINAnimatedImage.h
View file
Open in desktop
File renamed without changes.
0 ...ce/Classes/include/PINAnimatedImageView.h → ...ses/AnimatedImages/PINAnimatedImageView.h
View file
Open in desktop
File renamed without changes.
0 .../Classes/include/PINCachedAnimatedImage.h → ...s/AnimatedImages/PINCachedAnimatedImage.h
View file
Open in desktop
File renamed without changes.
0 Source/Classes/include/PINGIFAnimatedImage.h → ...sses/AnimatedImages/PINGIFAnimatedImage.h
View file
Open in desktop
File renamed without changes.
0 ...ce/Classes/include/PINWebPAnimatedImage.h → ...ses/AnimatedImages/PINWebPAnimatedImage.h
View file
Open in desktop
File renamed without changes.
0 ...e/Classes/include/NSData+ImageDetectors.h → ...lasses/Categories/NSData+ImageDetectors.h
View file
Open in desktop
File renamed without changes.
0 ...ude/PINAnimatedImageView+PINRemoteImage.h → ...ies/PINAnimatedImageView+PINRemoteImage.h
View file
Open in desktop
File renamed without changes.
0 ...lasses/include/PINButton+PINRemoteImage.h → ...mageCategories/PINButton+PINRemoteImage.h
View file
Open in desktop
File renamed without changes.
0 ...ses/include/PINImageView+PINRemoteImage.h → ...eCategories/PINImageView+PINRemoteImage.h
View file
Open in desktop
File renamed without changes.
0 ...lude/PINAlternateRepresentationProvider.h → ...sses/PINAlternateRepresentationProvider.h
View file
Open in desktop
File renamed without changes.
0 .../include/PINCache+PINRemoteImageCaching.h → .../Classes/PINCache+PINRemoteImageCaching.h
View file
Open in desktop
File renamed without changes.
0 Source/Classes/include/PINProgressiveImage.h → Source/Classes/PINProgressiveImage.h
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions Source/Classes/include/PINRemoteImage.h → Source/Classes/PINRemoteImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@

#import "NSData+ImageDetectors.h"
#import "PINAlternateRepresentationProvider.h"
#import "PINAnimatedImageView.h"
#import "PINAnimatedImageView+PINRemoteImage.h"
#import "PINButton+PINRemoteImage.h"
#import "PINCachedAnimatedImage.h"
#import "PINGIFAnimatedImage.h"
#import "PINImageView+PINRemoteImage.h"
#import "PINWebPAnimatedImage.h"
#import "PINRemoteImageManager.h"
#import "PINRemoteImageCategoryManager.h"
Expand Down
0 ...e/Classes/include/PINRemoteImageCaching.h → Source/Classes/PINRemoteImageCaching.h
View file
Open in desktop
File renamed without changes.
0 ...s/include/PINRemoteImageCategoryManager.h → ...e/Classes/PINRemoteImageCategoryManager.h
View file
Open in desktop
File renamed without changes.
0 ...ce/Classes/include/PINRemoteImageMacros.h → Source/Classes/PINRemoteImageMacros.h
View file
Open in desktop
File renamed without changes.
0 ...e/Classes/include/PINRemoteImageManager.h → Source/Classes/PINRemoteImageManager.h
View file
Open in desktop
File renamed without changes.
0 ...ses/include/PINRemoteImageManagerResult.h → Source/Classes/PINRemoteImageManagerResult.h
View file
Open in desktop
File renamed without changes.
0 ...Classes/include/PINRequestRetryStrategy.h → Source/Classes/PINRequestRetryStrategy.h
View file
Open in desktop
File renamed without changes.
0 ...ce/Classes/include/PINURLSessionManager.h → Source/Classes/PINURLSessionManager.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/NSData+ImageDetectors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../Categories/NSData+ImageDetectors.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINAlternateRepresentationProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINAlternateRepresentationProvider.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINAnimatedImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../AnimatedImages/PINAnimatedImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINAnimatedImageView+PINRemoteImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ImageCategories/PINAnimatedImageView+PINRemoteImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINAnimatedImageView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../AnimatedImages/PINAnimatedImageView.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINButton+PINRemoteImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ImageCategories/PINButton+PINRemoteImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINCache+PINRemoteImageCaching.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINCache+PINRemoteImageCaching.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINCachedAnimatedImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../AnimatedImages/PINCachedAnimatedImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINGIFAnimatedImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../AnimatedImages/PINGIFAnimatedImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINImageView+PINRemoteImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ImageCategories/PINImageView+PINRemoteImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINProgressiveImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINProgressiveImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRemoteImage.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImageCaching.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRemoteImageCaching.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImageCategoryManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRemoteImageCategoryManager.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImageMacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRemoteImageMacros.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImageManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRemoteImageManager.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImageManagerResult.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRemoteImageManagerResult.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRequestRetryStrategy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINRequestRetryStrategy.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINURLSessionManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../PINURLSessionManager.h
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINWebPAnimatedImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../AnimatedImages/PINWebPAnimatedImage.h