Skip to content
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.

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

Remove the PCH file and ensure macros are defined before using #556

Merged
merged 3 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions PINRemoteImage.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Pod::Spec.new do |s|
s.license = 'Apache 2.0'
s.author = { "Garrett Moon" => "[email protected]" }
s.source = { :git => "https://github.com/pinterest/PINRemoteImage.git", :tag => s.version.to_s }
s.prefix_header_file = false
# s.social_media_url = 'https://twitter.com/garrettmoon'

ios_deployment = "8.0"
Expand Down
3 changes: 1 addition & 2 deletions Source/Classes/AnimatedImages/PINAnimatedImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
//

#import <Foundation/Foundation.h>
#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"

NS_ASSUME_NONNULL_BEGIN

extern NSErrorDomain const kPINAnimatedImageErrorDomain;
Expand Down
2 changes: 2 additions & 0 deletions Source/Classes/AnimatedImages/PINAnimatedImageView.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
// Created by Garrett Moon on 4/17/18.
//

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
Expand Down
1 change: 1 addition & 0 deletions Source/Classes/AnimatedImages/PINCachedAnimatedImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"
#import "PINAnimatedImage.h"

@interface PINCachedAnimatedImage : NSObject
Expand Down
2 changes: 2 additions & 0 deletions Source/Classes/Categories/NSData+ImageDetectors.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

@interface NSData (PINImageDetectors)

- (BOOL)pin_isGIF;
Expand Down
4 changes: 2 additions & 2 deletions Source/Classes/Categories/PINImage+DecodedImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"

#if !PIN_TARGET_IOS
@interface NSImage (PINiOSMapping)

Expand Down
4 changes: 2 additions & 2 deletions Source/Classes/Categories/PINImage+ScaledImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"

@interface PINImage (PINScaledImage)

- (PINImage *)pin_scaledImageForKey:(NSString *)key;
Expand Down
4 changes: 2 additions & 2 deletions Source/Classes/Categories/PINImage+WebP.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//

#import "PINRemoteImageMacros.h"

#if PIN_WEBP

#if PIN_TARGET_IOS
Expand All @@ -14,8 +16,6 @@
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"

@interface PINImage (PINWebP)

+ (PINImage *)pin_imageWithWebPData:(NSData *)webPData;
Expand Down
2 changes: 2 additions & 0 deletions Source/Classes/ImageCategories/PINButton+PINRemoteImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
Expand Down
2 changes: 2 additions & 0 deletions Source/Classes/ImageCategories/PINImageView+PINRemoteImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
Expand Down
4 changes: 2 additions & 2 deletions Source/Classes/PINProgressiveImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"

@class PINRemoteImageDownloadTask;

/** An object which store the data of a downloading image and vends progressive scans **/
Expand Down
1 change: 0 additions & 1 deletion Source/Classes/PINRemoteImageCaching.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#import <Foundation/Foundation.h>


NS_ASSUME_NONNULL_BEGIN

@protocol PINRemoteImageCaching;
Expand Down
2 changes: 2 additions & 0 deletions Source/Classes/PINRemoteImageCategoryManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
Expand Down
3 changes: 2 additions & 1 deletion Source/Classes/PINRemoteImageManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"
#import "PINRemoteImageManagerResult.h"

#define PINRemoteImageHTTPMaximumConnectionsPerHost UINT16_MAX
Expand Down
2 changes: 2 additions & 0 deletions Source/Classes/PINRemoteImageManagerConfiguration.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
Expand Down
4 changes: 2 additions & 2 deletions Source/Classes/PINRemoteImageManagerResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#import <Foundation/Foundation.h>

#import "PINRemoteImageMacros.h"

#if PIN_TARGET_IOS
#import <UIKit/UIKit.h>
#elif PIN_TARGET_MAC
#import <Cocoa/Cocoa.h>
#endif

#import "PINRemoteImageMacros.h"

/** How the image was fetched. */
typedef NS_ENUM(NSUInteger, PINRemoteImageResultType) {
/** Returned if no image is returned */
Expand Down
10 changes: 0 additions & 10 deletions Source/PINRemoteImage-Prefix.pch

This file was deleted.