Explorar el Código

Upgrade CocoaPods integration

onevcat hace 7 años
padre
commit
72fde19355
Se han modificado 41 ficheros con 48 adiciones y 192 borrados
  1. 12 0
      Kingfisher.xcodeproj/project.pbxproj
  2. 0 10
      Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h
  3. 1 0
      Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h
  4. 0 5
      Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h
  5. 1 0
      Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h
  6. 0 16
      Pods/Headers/Private/Nocilla/LSDataMatcher.h
  7. 1 0
      Pods/Headers/Private/Nocilla/LSDataMatcher.h
  8. 0 6
      Pods/Headers/Private/Nocilla/LSHTTPClientHook.h
  9. 1 0
      Pods/Headers/Private/Nocilla/LSHTTPClientHook.h
  10. 0 10
      Pods/Headers/Private/Nocilla/LSHTTPRequest.h
  11. 1 0
      Pods/Headers/Private/Nocilla/LSHTTPRequest.h
  12. 0 6
      Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h
  13. 1 0
      Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h
  14. 0 8
      Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h
  15. 1 0
      Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h
  16. 0 7
      Pods/Headers/Private/Nocilla/LSHTTPResponse.h
  17. 1 0
      Pods/Headers/Private/Nocilla/LSHTTPResponse.h
  18. 0 5
      Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h
  19. 1 0
      Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h
  20. 0 9
      Pods/Headers/Private/Nocilla/LSMatcher.h
  21. 1 0
      Pods/Headers/Private/Nocilla/LSMatcher.h
  22. 0 5
      Pods/Headers/Private/Nocilla/LSNSURLHook.h
  23. 1 0
      Pods/Headers/Private/Nocilla/LSNSURLHook.h
  24. 0 15
      Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h
  25. 1 0
      Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h
  26. 0 7
      Pods/Headers/Private/Nocilla/LSRegexMatcher.h
  27. 1 0
      Pods/Headers/Private/Nocilla/LSRegexMatcher.h
  28. 0 8
      Pods/Headers/Private/Nocilla/LSStringMatcher.h
  29. 1 0
      Pods/Headers/Private/Nocilla/LSStringMatcher.h
  30. 0 24
      Pods/Headers/Private/Nocilla/LSStubRequest.h
  31. 1 0
      Pods/Headers/Private/Nocilla/LSStubRequest.h
  32. 0 22
      Pods/Headers/Private/Nocilla/LSStubResponse.h
  33. 1 0
      Pods/Headers/Private/Nocilla/LSStubResponse.h
  34. 0 5
      Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h
  35. 1 0
      Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h
  36. 0 6
      Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h
  37. 1 0
      Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h
  38. 0 8
      Pods/Headers/Private/Nocilla/asihttprequeststub.h
  39. 1 0
      Pods/Headers/Private/Nocilla/asihttprequeststub.h
  40. 15 10
      Pods/Pods.xcodeproj/project.pbxproj
  41. 2 0
      Tests/KingfisherTests/ImageExtensionTests.swift

+ 12 - 0
Kingfisher.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		185218B61CC07F8300BD58DE /* NSButtonExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 185218B51CC07F8300BD58DE /* NSButtonExtensionTests.swift */; };
+		27E5080C747EEE32B3B3D56E /* libPods-KingfisherTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCDD057F8DA8D24EE701CF98 /* libPods-KingfisherTests.a */; };
 		4B10480D216F157000300C61 /* ImageDataProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B10480C216F157000300C61 /* ImageDataProcessor.swift */; };
 		4B10480E216F157000300C61 /* ImageDataProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B10480C216F157000300C61 /* ImageDataProcessor.swift */; };
 		4B10480F216F157000300C61 /* ImageDataProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B10480C216F157000300C61 /* ImageDataProcessor.swift */; };
@@ -40,6 +41,7 @@
 		4B8E291D216F40AA0095FAD1 /* AuthenticationChallengeResponsable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8E291B216F40AA0095FAD1 /* AuthenticationChallengeResponsable.swift */; };
 		4B8E291E216F40AA0095FAD1 /* AuthenticationChallengeResponsable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8E291B216F40AA0095FAD1 /* AuthenticationChallengeResponsable.swift */; };
 		4B8E291F216F40AA0095FAD1 /* AuthenticationChallengeResponsable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8E291B216F40AA0095FAD1 /* AuthenticationChallengeResponsable.swift */; };
+		AE1D6776DC6183B84B561961 /* libPods-KingfisherTests-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 124FABC032484C46AC221D0C /* libPods-KingfisherTests-tvOS.a */; };
 		D10EC2361C3D632300A4211C /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2944481C3D01B20088C3E7 /* Kingfisher.framework */; };
 		D114F36E215D2D0B00A01349 /* String+MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = D12AB6BC215D2BB50013BA68 /* String+MD5.swift */; };
 		D12AB6C0215D2BB50013BA68 /* RequestModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = D12AB69D215D2BB50013BA68 /* RequestModifier.swift */; };
@@ -203,6 +205,7 @@
 		D9638BA61C7DC71F0046523D /* ImagePrefetcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9638BA41C7DC71F0046523D /* ImagePrefetcherTests.swift */; };
 		D9638BA71C7DCF560046523D /* ImagePrefetcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9638BA41C7DC71F0046523D /* ImagePrefetcherTests.swift */; };
 		D9638BA81C7DCF570046523D /* ImagePrefetcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9638BA41C7DC71F0046523D /* ImagePrefetcherTests.swift */; };
+		E31853303C9C8A94F3A8D16A /* libPods-KingfisherTests-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 304293EFEECEDC34FAB93806 /* libPods-KingfisherTests-macOS.a */; };
 		F72CE9CE1FCF17ED00CC522A /* ImageModifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72CE9CD1FCF17ED00CC522A /* ImageModifierTests.swift */; };
 		F72CE9CF1FCF17ED00CC522A /* ImageModifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72CE9CD1FCF17ED00CC522A /* ImageModifierTests.swift */; };
 		F72CE9D01FCF17ED00CC522A /* ImageModifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72CE9CD1FCF17ED00CC522A /* ImageModifierTests.swift */; };
@@ -234,7 +237,9 @@
 
 /* Begin PBXFileReference section */
 		033CD4A1D8C6D03D7AC150BE /* Pods-KingfisherTests-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KingfisherTests-tvOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.release.xcconfig"; sourceTree = "<group>"; };
+		124FABC032484C46AC221D0C /* libPods-KingfisherTests-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KingfisherTests-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		185218B51CC07F8300BD58DE /* NSButtonExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSButtonExtensionTests.swift; sourceTree = "<group>"; };
+		304293EFEECEDC34FAB93806 /* libPods-KingfisherTests-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KingfisherTests-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4AB2628A580157ADADCE0011 /* Pods-KingfisherTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KingfisherTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.debug.xcconfig"; sourceTree = "<group>"; };
 		4B10480C216F157000300C61 /* ImageDataProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDataProcessor.swift; sourceTree = "<group>"; };
 		4B164ACE1B8D554200768EC6 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
@@ -251,6 +256,7 @@
 		4BCCF3441D5B0457003387C2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6CD5C0134AA4B1C0892E7319 /* Pods-KingfisherTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KingfisherTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.release.xcconfig"; sourceTree = "<group>"; };
 		7204D40BEFEA059FA25864C4 /* Pods-KingfisherTests-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KingfisherTests-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KingfisherTests-macOS/Pods-KingfisherTests-macOS.debug.xcconfig"; sourceTree = "<group>"; };
+		CCDD057F8DA8D24EE701CF98 /* libPods-KingfisherTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KingfisherTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D10EC2311C3D632300A4211C /* KingfisherTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "KingfisherTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D12AB69D215D2BB50013BA68 /* RequestModifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestModifier.swift; sourceTree = "<group>"; };
 		D12AB69E215D2BB50013BA68 /* Resource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Resource.swift; sourceTree = "<group>"; };
@@ -325,6 +331,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B3766841C478F940001443F /* Kingfisher.framework in Frameworks */,
+				AE1D6776DC6183B84B561961 /* libPods-KingfisherTests-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -333,6 +340,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D10EC2361C3D632300A4211C /* Kingfisher.framework in Frameworks */,
+				E31853303C9C8A94F3A8D16A /* libPods-KingfisherTests-macOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -362,6 +370,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D1ED2D401AD2D09F00CFC3EB /* Kingfisher.framework in Frameworks */,
+				27E5080C747EEE32B3B3D56E /* libPods-KingfisherTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -578,6 +587,9 @@
 			children = (
 				4B164ACE1B8D554200768EC6 /* CFNetwork.framework */,
 				4B3E714D1B01FEB200F5AAED /* WatchKit.framework */,
+				CCDD057F8DA8D24EE701CF98 /* libPods-KingfisherTests.a */,
+				304293EFEECEDC34FAB93806 /* libPods-KingfisherTests-macOS.a */,
+				124FABC032484C46AC221D0C /* libPods-KingfisherTests-tvOS.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

+ 0 - 10
Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h

@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSHTTPRequest.h"
-
-@class ASIHTTPRequest;
-
-@interface LSASIHTTPRequestAdapter : NSObject<LSHTTPRequest>
-
-- (instancetype)initWithASIHTTPRequest:(ASIHTTPRequest *)request;
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.h

+ 0 - 5
Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h

@@ -1,5 +0,0 @@
-#import "LSHTTPClientHook.h"
-
-@interface LSASIHTTPRequestHook : LSHTTPClientHook
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.h

+ 0 - 16
Pods/Headers/Private/Nocilla/LSDataMatcher.h

@@ -1,16 +0,0 @@
-//
-//  LSDataMatcher.h
-//  Nocilla
-//
-//  Created by Luis Solano Bonet on 09/11/14.
-//  Copyright (c) 2014 Luis Solano Bonet. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "LSMatcher.h"
-
-@interface LSDataMatcher : LSMatcher
-
-- (instancetype)initWithData:(NSData *)data;
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSDataMatcher.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Matchers/LSDataMatcher.h

+ 0 - 6
Pods/Headers/Private/Nocilla/LSHTTPClientHook.h

@@ -1,6 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface LSHTTPClientHook : NSObject
-- (void)load;
-- (void)unload;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSHTTPClientHook.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/LSHTTPClientHook.h

+ 0 - 10
Pods/Headers/Private/Nocilla/LSHTTPRequest.h

@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@protocol LSHTTPRequest <NSObject>
-
-@property (nonatomic, strong, readonly) NSURL *url;
-@property (nonatomic, strong, readonly) NSString *method;
-@property (nonatomic, strong, readonly) NSDictionary *headers;
-@property (nonatomic, strong, readonly) NSData *body;
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSHTTPRequest.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Model/LSHTTPRequest.h

+ 0 - 6
Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h

@@ -1,6 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSHTTPRequest.h"
-
-@interface LSHTTPRequestDSLRepresentation : NSObject
-- (id)initWithRequest:(id<LSHTTPRequest>)request;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.h

+ 0 - 8
Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h

@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSHTTPRequest.h"
-
-@interface LSHTTPRequestDiff : NSObject
-@property (nonatomic, assign, readonly, getter = isEmpty) BOOL empty;
-
-- (id)initWithRequest:(id<LSHTTPRequest>)oneRequest andRequest:(id<LSHTTPRequest>)anotherRequest;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Diff/LSHTTPRequestDiff.h

+ 0 - 7
Pods/Headers/Private/Nocilla/LSHTTPResponse.h

@@ -1,7 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@protocol LSHTTPResponse <NSObject>
-@property (nonatomic, assign, readonly) NSInteger statusCode;
-@property (nonatomic, strong, readonly) NSDictionary *headers;
-@property (nonatomic, strong, readonly) NSData *body;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSHTTPResponse.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Model/LSHTTPResponse.h

+ 0 - 5
Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface LSHTTPStubURLProtocol : NSURLProtocol
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.h

+ 0 - 9
Pods/Headers/Private/Nocilla/LSMatcher.h

@@ -1,9 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface LSMatcher : NSObject
-
-- (BOOL)matches:(NSString *)string;
-
-- (BOOL)matchesData:(NSData *)data;
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSMatcher.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Matchers/LSMatcher.h

+ 0 - 5
Pods/Headers/Private/Nocilla/LSNSURLHook.h

@@ -1,5 +0,0 @@
-#import "LSHTTPClientHook.h"
-
-@interface LSNSURLHook : LSHTTPClientHook
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSNSURLHook.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.h

+ 0 - 15
Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h

@@ -1,15 +0,0 @@
-//
-//  LSNSURLSessionHook.h
-//  Nocilla
-//
-//  Created by Luis Solano Bonet on 08/01/14.
-//  Copyright (c) 2014 Luis Solano Bonet. All rights reserved.
-//
-
-#import <Nocilla/Nocilla.h>
-
-#import "LSHTTPClientHook.h"
-
-@interface LSNSURLSessionHook : LSHTTPClientHook
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.h

+ 0 - 7
Pods/Headers/Private/Nocilla/LSRegexMatcher.h

@@ -1,7 +0,0 @@
-#import "LSMatcher.h"
-
-@interface LSRegexMatcher : LSMatcher
-
-- (instancetype)initWithRegex:(NSRegularExpression *)regex;
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSRegexMatcher.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Matchers/LSRegexMatcher.h

+ 0 - 8
Pods/Headers/Private/Nocilla/LSStringMatcher.h

@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSMatcher.h"
-
-@interface LSStringMatcher : LSMatcher
-
-- (instancetype)initWithString:(NSString *)string;
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSStringMatcher.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Matchers/LSStringMatcher.h

+ 0 - 24
Pods/Headers/Private/Nocilla/LSStubRequest.h

@@ -1,24 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSStubResponse.h"
-#import "LSHTTPRequest.h"
-
-
-@class LSMatcher;
-@class LSStubRequest;
-@class LSStubResponse;
-
-@interface LSStubRequest : NSObject
-@property (nonatomic, strong, readonly) NSString *method;
-@property (nonatomic, strong, readonly) LSMatcher *urlMatcher;
-@property (nonatomic, strong, readonly) NSDictionary *headers;
-@property (nonatomic, strong, readwrite) LSMatcher *body;
-
-@property (nonatomic, strong) LSStubResponse *response;
-
-- (instancetype)initWithMethod:(NSString *)method url:(NSString *)url;
-- (instancetype)initWithMethod:(NSString *)method urlMatcher:(LSMatcher *)urlMatcher;
-
-- (void)setHeader:(NSString *)header value:(NSString *)value;
-
-- (BOOL)matchesRequest:(id<LSHTTPRequest>)request;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSStubRequest.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Stubs/LSStubRequest.h

+ 0 - 22
Pods/Headers/Private/Nocilla/LSStubResponse.h

@@ -1,22 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSHTTPResponse.h"
-
-@interface LSStubResponse : NSObject<LSHTTPResponse>
-
-@property (nonatomic, assign, readonly) NSInteger statusCode;
-@property (nonatomic, strong) NSData *body;
-@property (nonatomic, strong, readonly) NSDictionary *headers;
-
-@property (nonatomic, assign, readonly) BOOL shouldFail;
-@property (nonatomic, strong, readonly) NSError *error;
-
-- (id)initWithError:(NSError *)error;
-- (id)initWithStatusCode:(NSInteger)statusCode;
-- (id)initWithRawResponse:(NSData *)rawResponseData;
-- (id)initDefaultResponse;
-- (void)setHeader:(NSString *)header value:(NSString *)value;
-
-- (void)delay;
-- (void)go;
-- (void)waitForGo;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/LSStubResponse.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Stubs/LSStubResponse.h

+ 0 - 5
Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface NSURLRequest (DSL)
-- (NSString *)toNocillaDSL;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.h

+ 0 - 6
Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h

@@ -1,6 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "LSHTTPRequest.h"
-
-@interface NSURLRequest (LSHTTPRequest)<LSHTTPRequest>
-
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.h

+ 0 - 8
Pods/Headers/Private/Nocilla/asihttprequeststub.h

@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface ASIHTTPRequestStub : NSObject
-- (int)stub_responseStatusCode;
-- (NSData *)stub_responseData;
-- (NSDictionary *)stub_responseHeaders;
-- (void)stub_startRequest;
-@end

+ 1 - 0
Pods/Headers/Private/Nocilla/asihttprequeststub.h

@@ -0,0 +1 @@
+../../../Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.h

+ 15 - 10
Pods/Pods.xcodeproj/project.pbxproj

@@ -205,7 +205,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		012A1C2A72428B1238BEA0A8B7877786 /* libPods-KingfisherTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KingfisherTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		012A1C2A72428B1238BEA0A8B7877786 /* libPods-KingfisherTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-KingfisherTests.a"; path = "libPods-KingfisherTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		070FBB4CAED1D28AE5C0B867F37121F7 /* LSASIHTTPRequestHook.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LSASIHTTPRequestHook.m; path = Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.m; sourceTree = "<group>"; };
 		07CC5BBD29222E7E2EAD29E784AC88A6 /* LSStubResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LSStubResponse.h; path = Nocilla/Stubs/LSStubResponse.h; sourceTree = "<group>"; };
 		0A3A2F06392811B59E86B52CF4483530 /* Pods-KingfisherTests-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-KingfisherTests-tvOS.release.xcconfig"; sourceTree = "<group>"; };
@@ -213,7 +213,7 @@
 		0BEB44E82833BCD6CE27E5C5E9D5616F /* Pods-KingfisherTests-tvOS-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-KingfisherTests-tvOS-acknowledgements.markdown"; sourceTree = "<group>"; };
 		0C3C917FE6A28AFE7F41CB7B4B1A4C91 /* LSHTTPStubURLProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LSHTTPStubURLProtocol.h; path = Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.h; sourceTree = "<group>"; };
 		0F0D7FF2C9DA14CE184375AC7B2C6D73 /* Pods-KingfisherTests-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-KingfisherTests-macOS.debug.xcconfig"; sourceTree = "<group>"; };
-		11690BC5A0B05F32B240DA7192817CA1 /* libPods-KingfisherTests-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KingfisherTests-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		11690BC5A0B05F32B240DA7192817CA1 /* libPods-KingfisherTests-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-KingfisherTests-tvOS.a"; path = "libPods-KingfisherTests-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		15D2A78403725FC4D91EFABE90118D95 /* NSURLRequest+LSHTTPRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLRequest+LSHTTPRequest.h"; path = "Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.h"; sourceTree = "<group>"; };
 		19467FFCB738763CBD7925078A2935CC /* Pods-KingfisherTests-macOS-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-KingfisherTests-macOS-acknowledgements.plist"; sourceTree = "<group>"; };
 		1F0C5A65F3FE934337A3EFECC69CE255 /* Pods-KingfisherTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-KingfisherTests-acknowledgements.markdown"; sourceTree = "<group>"; };
@@ -231,12 +231,12 @@
 		44FA74975C4E9116C2D45CD82838A328 /* LSASIHTTPRequestAdapter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LSASIHTTPRequestAdapter.m; path = Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.m; sourceTree = "<group>"; };
 		4919D8B656A57098295C655735F4B1B4 /* NSURLRequest+DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLRequest+DSL.m"; path = "Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.m"; sourceTree = "<group>"; };
 		4A5F1A67D29C2E4D77DCAEA139910FDE /* Nocilla-tvOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "Nocilla-tvOS-prefix.pch"; path = "../Nocilla-tvOS/Nocilla-tvOS-prefix.pch"; sourceTree = "<group>"; };
-		4D2057AF2695544F1F10A7EC07DD3FCF /* libNocilla-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libNocilla-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4D2057AF2695544F1F10A7EC07DD3FCF /* libNocilla-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libNocilla-iOS.a"; path = "libNocilla-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5036C1EE9C1F23BAD27139DAA655845F /* LSDataMatcher.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LSDataMatcher.m; path = Nocilla/Matchers/LSDataMatcher.m; sourceTree = "<group>"; };
 		588488FDD3DC715C789C633D8AE779BF /* NSRegularExpression+Matcheable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSRegularExpression+Matcheable.h"; path = "Nocilla/Matchers/NSRegularExpression+Matcheable.h"; sourceTree = "<group>"; };
-		5A5FCFCF3B3D86BC1B041D3E877BA477 /* libNocilla-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libNocilla-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5A5FCFCF3B3D86BC1B041D3E877BA477 /* libNocilla-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libNocilla-macOS.a"; path = "libNocilla-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5EA65663C1341EC3A4E733F375F1760A /* LSMatcheable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LSMatcheable.h; path = Nocilla/Matchers/LSMatcheable.h; sourceTree = "<group>"; };
-		5F233054A3754E145F753C01DD5ACEDA /* libPods-KingfisherTests-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KingfisherTests-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5F233054A3754E145F753C01DD5ACEDA /* libPods-KingfisherTests-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-KingfisherTests-macOS.a"; path = "libPods-KingfisherTests-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		609A5F7A79B0FA2131203E4023B0C276 /* Pods-KingfisherTests-macOS-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-KingfisherTests-macOS-acknowledgements.markdown"; sourceTree = "<group>"; };
 		6150EC783F65711E86018573BE092A18 /* NSURLRequest+DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLRequest+DSL.h"; path = "Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.h"; sourceTree = "<group>"; };
 		636FCA7AE537CF093BCB08291D42C618 /* Nocilla-iOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nocilla-iOS-dummy.m"; sourceTree = "<group>"; };
@@ -248,12 +248,12 @@
 		79D458F95CF490E3B7FF37A14AC3D780 /* Pods-KingfisherTests-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-KingfisherTests-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
 		7DDB7287C0B14977704607BB2B0C1809 /* NSString+Matcheable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+Matcheable.h"; path = "Nocilla/Matchers/NSString+Matcheable.h"; sourceTree = "<group>"; };
 		80ED34909071E8F44747E3928C5F701A /* LSStubRequestDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LSStubRequestDSL.m; path = Nocilla/DSL/LSStubRequestDSL.m; sourceTree = "<group>"; };
-		8706801FE7F2520B7FBD16EC7389B00E /* libNocilla-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libNocilla-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		8706801FE7F2520B7FBD16EC7389B00E /* libNocilla-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libNocilla-tvOS.a"; path = "libNocilla-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8999D55E9B4132222156CCCF79462152 /* Nocilla-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nocilla-iOS-prefix.pch"; sourceTree = "<group>"; };
 		8A7B68F35D21AE88703039A14B72CB5C /* LSNocilla.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LSNocilla.m; path = Nocilla/LSNocilla.m; sourceTree = "<group>"; };
 		9092A696B77C60BAB028308EA29714C1 /* ASIHTTPRequestStub.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ASIHTTPRequestStub.m; path = Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.m; sourceTree = "<group>"; };
 		90D117917B335D15AF1D8A052FBE2467 /* Pods-KingfisherTests-macOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-KingfisherTests-macOS-dummy.m"; sourceTree = "<group>"; };
-		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		9425C16C4CA4AD18C8D84218F4652AB8 /* LSHTTPBody.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LSHTTPBody.h; path = Nocilla/Model/LSHTTPBody.h; sourceTree = "<group>"; };
 		94ECB89C9A4661E83DC2670382C2FB63 /* LSRegexMatcher.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LSRegexMatcher.m; path = Nocilla/Matchers/LSRegexMatcher.m; sourceTree = "<group>"; };
 		986E9D753B6B2E2721597936EC9FAAD3 /* Nocilla-macOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "Nocilla-macOS-dummy.m"; path = "../Nocilla-macOS/Nocilla-macOS-dummy.m"; sourceTree = "<group>"; };
@@ -461,6 +461,7 @@
 				43B7D8FB64B8CBDED592BFE170938170 /* NSURLRequest+LSHTTPRequest.m */,
 				DF011D1464A72D843958CE77C2EBD837 /* Support Files */,
 			);
+			name = Nocilla;
 			path = Nocilla;
 			sourceTree = "<group>";
 		};
@@ -757,7 +758,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 0930;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1000,6 +1001,7 @@
 			baseConfigurationReference = 0F0D7FF2C9DA14CE184375AC7B2C6D73 /* Pods-KingfisherTests-macOS.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1027,7 +1029,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				GCC_PREFIX_HEADER = "Target Support Files/Nocilla-iOS/Nocilla-iOS-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PRIVATE_HEADERS_FOLDER_PATH = "";
@@ -1195,6 +1197,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = CF99B902587D0AF28C189733B730808D /* Nocilla-macOS.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -1245,7 +1248,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				GCC_PREFIX_HEADER = "Target Support Files/Nocilla-iOS/Nocilla-iOS-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PRIVATE_HEADERS_FOLDER_PATH = "";
@@ -1264,6 +1267,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = CF99B902587D0AF28C189733B730808D /* Nocilla-macOS.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -1313,6 +1317,7 @@
 			baseConfigurationReference = B60319837197051678E27EF0342C5EDF /* Pods-KingfisherTests-macOS.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";

+ 2 - 0
Tests/KingfisherTests/ImageExtensionTests.swift

@@ -281,9 +281,11 @@ class ImageExtensionTests: XCTestCase {
         XCTAssertNotNil(gifImage)
         XCTAssertEqual(gifImage!.kf.normalized, gifImage!)
         
+        #if os(iOS) || os(tvOS)
         // No need to normalize up orientation image.
         let normalImage = testImage
         XCTAssertEqual(normalImage.imageOrientation, .up)
         XCTAssertEqual(normalImage, testImage)
+        #endif
     }
 }