Nullability

contentful-labs · Jan 29, 2018 · c5a2019 · c5a2019
1 parent 0ef7b96
commit c5a2019
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/Code/CCBufferedImageDecoder.h b/Code/CCBufferedImageDecoder.h
@@ -41,15 +41,15 @@ typedef NS_ENUM(NSInteger, CCDecodingStatus){
  *
  *  @return An initialized decoder instance.
  */
--(instancetype)initWithData:(NSData*)data;
+-(instancetype _Nullable)initWithData:(NSData* _Nullable)data;
 
 /**
  *  Convert the result RGB data to an image instance.
  *
  *  @return An image instance for use in Cocoa.
  */
 #if TARGET_OS_IPHONE
--(UIImage*)toImage;
+-(UIImage* _Nullable)toImage;
 #else
 -(NSImage*)toImage;
 #endif

diff --git a/Concorde.xcodeproj/project.pbxproj b/Concorde.xcodeproj/project.pbxproj
@@ -667,10 +667,7 @@
 			baseConfigurationReference = C7FA5798FD4F2480455DDBEB /* Pods-ConcordeTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -690,10 +687,7 @@
 			baseConfigurationReference = C954D01EE7376AF398F9DFA2 /* Pods-ConcordeTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.$(PRODUCT_NAME:rfc1034identifier)";