Merge pull request #3 from ride/null_warnings

Fix nullability issues
bithavoc · Nov 16, 2015 · c6ca3d0 · c6ca3d0
2 parents d79fd9b + f3ff2a3
commit c6ca3d0
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 47 deletions.
diff --git a/RMErrors.podspec b/RMErrors.podspec
@@ -6,12 +6,13 @@ Pod::Spec.new do |s|
   s.homepage = 'https://github.com/AFNetworking/AFNetworking'
   s.authors  = { 'Bithavoc' => 'im@bithavoc.io' }
   s.source   = { :git => 'https://github.com/ride/RMErrors.git', :tag=>s.version }
+
   s.requires_arc = true
 
   s.public_header_files = 'RMErrors/*.{h}'
   s.source_files = 'RMErrors/*.{h,m}'
 
-  s.ios.deployment_target = '7.0'
+  s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.9'
   s.watchos.deployment_target = '2.0'
 end
diff --git a/RMErrors/RMErrorCodeBoundary.h b/RMErrors/RMErrorCodeBoundary.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @protocol RMErrorCodeBoundary <NSObject>
 

diff --git a/RMErrors/RMErrorCodeDefinition.h b/RMErrors/RMErrorCodeDefinition.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorCodeBoundary.h"
 #import "RMErrorDescription.h"
 

diff --git a/RMErrors/RMErrorCodeDefinition.m b/RMErrors/RMErrorCodeDefinition.m
@@ -13,14 +13,17 @@
 static NSString *const RMErrorCodeDefinitionAttributeTransientName= @"transient";
 
 @implementation RMErrorCodeDefinition
+@synthesize boundary = _boundary;
+@synthesize friendlyMessage = _friendlyMessage;
+@synthesize transient = _transient;
 
 - (instancetype)init {
     return [self initWithBoundary:nil friendlyMessage:nil transient:NO];
 }
 
 - (instancetype)initWithBoundary:(id<RMErrorCodeBoundary>)boundary
                  friendlyMessage:(NSString *)friendlyMessage transient:(BOOL)transient {
-    if(self = [super init]) {
+    if((self = [super init])) {
         NSParameterAssert(boundary);
         _boundary = boundary;
         _friendlyMessage = friendlyMessage;

diff --git a/RMErrors/RMErrorCodeRangeBoundary.h b/RMErrors/RMErrorCodeRangeBoundary.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorCodeBoundary.h"
 
 extern NSInteger const RMErrorCodeRangeBoundaryDefaultLimit;

diff --git a/RMErrors/RMErrorCodeRangeBoundary.m b/RMErrors/RMErrorCodeRangeBoundary.m
@@ -13,21 +13,23 @@
 static NSString *const RMErrorCodeRangeBoundaryPatternSeparator = @"..";
 
 @implementation RMErrorCodeRangeBoundary
+@synthesize upperLimit = _upperLimit;
+@synthesize lowerLimit = _lowerLimit;
 
 - (instancetype)init {
     return [self initWithLower:RMErrorCodeRangeBoundaryDefaultLimit andUpper:RMErrorCodeRangeBoundaryDefaultLimit];
 }
 
 - (instancetype)initWithLower:(NSInteger)lower andUpper:(NSInteger)upper {
-    if(self = [super init]) {
+    if((self = [super init])) {
         _lowerLimit = lower;
         _upperLimit = upper;
     }
     return self;
 }
 
 - (BOOL)matches:(NSInteger)code {
-    return code >= _lowerLimit && code <= _upperLimit;
+    return code >= self.lowerLimit && code <= self.upperLimit;
 }
 
 + (instancetype)boundaryWithPattern:(NSString *)pattern {

diff --git a/RMErrors/RMErrorCodes.h b/RMErrors/RMErrorCodes.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorCodeDefinition.h"
 #import "RMErrorDescription.h"
 

diff --git a/RMErrors/RMErrorCodes.m b/RMErrors/RMErrorCodes.m
@@ -17,13 +17,14 @@ @interface RMErrorCodes()
 
 @implementation RMErrorCodes
 @dynamic definitions;
+@synthesize codes;
 
 - (instancetype)init {
     return [self initWithDictionary:nil];
 }
 
 - (instancetype)initWithDictionary:(NSDictionary *)domains {
-    if(self = [super init]) {
+    if((self = [super init])) {
         self.codes = [NSMutableArray array];
     }
     return self;

diff --git a/RMErrors/RMErrorDescription.h b/RMErrors/RMErrorDescription.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 extern NSString *const RMErrorDescriptionContentFriendlyMessageKey;
 extern NSString *const RMErrorDescriptionContentTransientKey;

diff --git a/RMErrors/RMErrorDescription.m b/RMErrors/RMErrorDescription.m
@@ -13,16 +13,16 @@
 NSString *const RMErrorDescriptionContentCodeKey = @"code";
 
 @implementation RMErrorDescription
+@synthesize transient = _transient;
+@synthesize friendlyMessage = _friendlyMessage;
+@synthesize code = _code;
 
 - (instancetype)init {
-    if(self = [self initWithFriendlyMessage:nil transient:NO code:-1]) {
-
-    }
-    return self;
+    return [self initWithFriendlyMessage:nil transient:NO code:-1];
 }
 
 - (instancetype)initWithFriendlyMessage:(NSString *)friendlyMessage transient:(BOOL)transient code:(NSInteger)code {
-    if(self = [super init]) {
+    if((self = [super init])) {
         _friendlyMessage = friendlyMessage;
         _transient = transient;
         _code = code;

diff --git a/RMErrors/RMErrorDomainDefinition.h b/RMErrors/RMErrorDomainDefinition.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorCodes.h"
 #import "RMErrorCodeDefinition.h"
 

diff --git a/RMErrors/RMErrorDomainDefinition.m b/RMErrors/RMErrorDomainDefinition.m
@@ -14,13 +14,16 @@
 static NSString *const RMErrorDomainDefinitionContentDefaultCodeKey = @"(default)";
 
 @implementation RMErrorDomainDefinition
+@synthesize name = _name;
+@synthesize codes = _codes;
+@synthesize defaultCode = _defaultCode;
 
 - (instancetype)init {
     return [self initWithName:nil];
 }
 
 - (instancetype)initWithName:(NSString *)name {
-    if(self = [super init]) {
+    if((self = [super init])) {
         NSParameterAssert(name);
         _name = name;
         _codes = [[RMErrorCodes alloc] init];

diff --git a/RMErrors/RMErrorDomains.h b/RMErrors/RMErrorDomains.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorDomainDefinition.h"
 #import "RMErrorDescription.h"
 

diff --git a/RMErrors/RMErrorDomains.m b/RMErrors/RMErrorDomains.m
@@ -17,13 +17,14 @@ @interface RMErrorDomains()
 
 @implementation RMErrorDomains
 @dynamic definitions;
+@synthesize domains;
 
 - (instancetype)init {
     return [self initWithDictionary:nil];
 }
 
 - (instancetype)initWithDictionary:(NSDictionary *)domains {
-    if(self = [super init]) {
+    if((self = [super init])) {
         self.domains = [NSMutableArray array];
     }
     return self;

diff --git a/RMErrors/RMErrorTransformation.h b/RMErrors/RMErrorTransformation.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 /**
  Implemented by error transformations

diff --git a/RMErrors/RMErrorTransformations.h b/RMErrors/RMErrorTransformations.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorTransformation.h"
 
 /**

diff --git a/RMErrors/RMErrorTransformations.m b/RMErrors/RMErrorTransformations.m
@@ -15,9 +15,10 @@ @interface RMErrorTransformations()
 @end
 
 @implementation RMErrorTransformations
+@synthesize list;
 
 - (instancetype)init {
-    if(self = [super init]) {
+    if((self = [super init])) {
         self.list = [NSMutableArray array];
     }
     return self;

diff --git a/RMErrors/RMErrors.h b/RMErrors/RMErrors.h
@@ -6,32 +6,32 @@
 //  Copyright (c) 2015 Ride. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "RMErrorDomains.h"
 #import "RMErrorDescription.h"
 #import "RMErrorTransformations.h"
 #import "RMErrorCodes.h"
 
-extern NSString *const RMErrorsContentDomainsKey;
-extern NSString *const RMErrorsContentDefaultKey;
-extern NSString *const RMErrorsDefaultFileName;
+extern NSString *__nonnull const RMErrorsContentDomainsKey;
+extern NSString *__nonnull const RMErrorsContentDefaultKey;
+extern NSString *__nonnull const RMErrorsDefaultFileName;
 
 @interface RMErrors : NSObject
 
 /**
  Error Domain definitions
  */
-@property (nonatomic, readonly) RMErrorDomains* domains;
+@property (nonatomic, nonnull, readonly) RMErrorDomains* domains;
 
 /**
  A collection of transformation to run prior describing the original error.
  */
-@property (nonatomic, readonly) RMErrorTransformations *transformations;
+@property (nonatomic, nonnull, readonly) RMErrorTransformations *transformations;
 
 /**
  Default error description in case is not found in domains and errors.
  */
-@property (nonatomic) RMErrorDescription *defaultDescription;
+@property (nonatomic, nullable) RMErrorDescription *defaultDescription;
 
 /**
  Load from parsed RMErrors.plist
@@ -53,6 +53,6 @@ extern NSString *const RMErrorsDefaultFileName;
 /**
  Process an error and returns a description
  */
-- (RMErrorDescription *)describe:(NSError *)error;
+- (nullable RMErrorDescription *)describe:(nonnull NSError *)error;
 
 @end
diff --git a/RMErrors/RMErrors.m b/RMErrors/RMErrors.m
@@ -13,9 +13,12 @@
 NSString *const RMErrorsDefaultFileName = @"RMErrors";
 
 @implementation RMErrors
+@synthesize domains = _domains;
+@synthesize transformations = _transformations;
+@synthesize defaultDescription = _defaultDescription;
 
 - (instancetype)init {
-    if(self = [super init]) {
+    if((self = [super init])) {
         _domains = [[RMErrorDomains alloc] init];
         _transformations = [[RMErrorTransformations alloc] init];
     }
@@ -30,7 +33,7 @@ - (void)load:(NSDictionary *)content {
     }
 }
 
-- (RMErrorDescription *)describe:(NSError *)error {
+- (nullable RMErrorDescription *)describe:(NSError *)error {
     NSError *transformed = [self.transformations transform:error];
     RMErrorDescription *description = [self.domains describe:transformed];
     if(description) {

diff --git a/Tests/Podfile b/Tests/Podfile
@@ -1,13 +1,13 @@
 xcodeproj 'RMErrorsTests'
 workspace '../RMErrors'
-inhibit_all_warnings!
+use_frameworks!
 
 def common_pods
   pod 'RMErrors', :path => '../'
 end
 
 target :ios do
-  platform :ios, '7.0'
+  platform :ios, '8.0'
   link_with 'RMErrorsIOSTests'
   common_pods
 end

diff --git a/Tests/RMErrorsTests.xcodeproj/project.pbxproj b/Tests/RMErrorsTests.xcodeproj/project.pbxproj
@@ -26,8 +26,8 @@
 		1E9597D51BF2FAFC004C4851 /* RMErrorsTransformationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E84A7EA1BF29F2000D1532C /* RMErrorsTransformationTest.m */; };
 		1EFF20BB1BF63963002A65C1 /* RMErrors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1EFF20BA1BF63963002A65C1 /* RMErrors.plist */; };
 		1EFF20BC1BF63966002A65C1 /* RMErrors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1EFF20BA1BF63963002A65C1 /* RMErrors.plist */; };
-		5525CEEDC150C468C8DF5683 /* libPods-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDA1BC800683D1E509E11F3E /* libPods-ios.a */; };
-		BB7CD182732BEBE7C717E0B7 /* libPods-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D7B757FF1A5FF486760FE18 /* libPods-osx.a */; };
+		4C57D94F189E98E8470F6437 /* Pods_osx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8764C77DB944C27DB9414DF2 /* Pods_osx.framework */; };
+		6150E705DB159ECDB2520F37 /* Pods_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BBC31B3CBFB36F4316ECC00 /* Pods_ios.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -46,11 +46,11 @@
 		1E9597C91BF2FAEA004C4851 /* RMErrorsOSXTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RMErrorsOSXTests.m; sourceTree = "<group>"; };
 		1E9597CB1BF2FAEA004C4851 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1EFF20BA1BF63963002A65C1 /* RMErrors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RMErrors.plist; sourceTree = "<group>"; };
+		2BBC31B3CBFB36F4316ECC00 /* Pods_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		35578B838AB067E90CF97C5D /* Pods-osx.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-osx.release.xcconfig"; path = "Pods/Target Support Files/Pods-osx/Pods-osx.release.xcconfig"; sourceTree = "<group>"; };
 		7767EB1B31CE7690808120B9 /* Pods-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios/Pods-ios.debug.xcconfig"; sourceTree = "<group>"; };
-		8D7B757FF1A5FF486760FE18 /* libPods-osx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-osx.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		8764C77DB944C27DB9414DF2 /* Pods_osx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_osx.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D96A260D7F7B8FD3663122A1 /* Pods-osx.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-osx.debug.xcconfig"; path = "Pods/Target Support Files/Pods-osx/Pods-osx.debug.xcconfig"; sourceTree = "<group>"; };
-		EDA1BC800683D1E509E11F3E /* libPods-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		FDC8FB2FD40BCD8294ADF04E /* Pods-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios/Pods-ios.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -60,15 +60,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				1E84A7E01BF29E1300D1532C /* Foundation.framework in Frameworks */,
-				5525CEEDC150C468C8DF5683 /* libPods-ios.a in Frameworks */,
+				6150E705DB159ECDB2520F37 /* Pods_ios.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		1E9597C41BF2FAEA004C4851 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB7CD182732BEBE7C717E0B7 /* libPods-osx.a in Frameworks */,
+				4C57D94F189E98E8470F6437 /* Pods_osx.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -109,8 +109,8 @@
 			isa = PBXGroup;
 			children = (
 				1E84A7DF1BF29E1300D1532C /* Foundation.framework */,
-				EDA1BC800683D1E509E11F3E /* libPods-ios.a */,
-				8D7B757FF1A5FF486760FE18 /* libPods-osx.a */,
+				2BBC31B3CBFB36F4316ECC00 /* Pods_ios.framework */,
+				8764C77DB944C27DB9414DF2 /* Pods_osx.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -384,13 +384,17 @@
 		1E84A7D01BF29BE000D1532C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 			};
 			name = Debug;
 		};
 		1E84A7D11BF29BE000D1532C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 			};
 			name = Release;

diff --git a/Tests/Tests/RMErrorCodesTest.m b/Tests/Tests/RMErrorCodesTest.m
@@ -7,8 +7,8 @@
 //
 
 #import <XCTest/XCTest.h>
-#import "RMErrorCodes.h"
-#import "RMErrorCodeRangeBoundary.h"
+#import <RMErrors/RMErrorCodes.h>
+#import <RMErrors/RMErrorCodeRangeBoundary.h>
 
 @interface RMErrorCodesTest : XCTestCase {
     NSDictionary *_content;