Merge branch 'master' into class_fix

erikdoe · Sep 1, 2020 · 794f6fa · 794f6fa
2 parents 8fba6a1 + 3dde0e4
commit 794f6fa
Show file tree

Hide file tree

Showing 59 changed files with 263 additions and 276 deletions.
diff --git a/OCMock.podspec b/OCMock.podspec
@@ -29,7 +29,8 @@ Pod::Spec.new do |s|
   s.public_header_files   = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h", 
                               "OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h", 
                               "OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h", 
-                              "OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h" ]
+                              "OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h",
+							  "OCMockMacros.h" ]
                               .map { |file| "Source/OCMock/" + file }
 
 end
diff --git a/Source/OCMock.xcodeproj/project.pbxproj b/Source/OCMock.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		030EF0B614632FD000B04273 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 030EF0B414632FD000B04273 /* InfoPlist.strings */; };
 		031E50581BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 031E50571BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m */; };
 		031E50591BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 031E50571BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m */; };
 		0322DA65191188D100CACAF1 /* OCMockObjectVerifyAfterRunTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0322DA64191188D100CACAF1 /* OCMockObjectVerifyAfterRunTests.m */; };
@@ -16,8 +15,12 @@
 		0322DA6A19118B4600CACAF1 /* OCMVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0322DA6719118B4600CACAF1 /* OCMVerifier.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0322DA6B19118B4600CACAF1 /* OCMVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 0322DA6819118B4600CACAF1 /* OCMVerifier.m */; };
 		0322DA6C19118B4600CACAF1 /* OCMVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 0322DA6819118B4600CACAF1 /* OCMVerifier.m */; };
+		033AB1FA24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		033AB1FB24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		033AB1FC24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		033AB1FD24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		033AB1FE24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		033E1FF414FEF5E0004456B0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 033E1FF314FEF5E0004456B0 /* Foundation.framework */; };
-		03565A3818F0566F003AE91E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03565A3618F0566F003AE91E /* InfoPlist.strings */; };
 		03565A4218F05721003AE91E /* OCMockObjectPartialMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03AC5C1416DF9FA500D82ECD /* OCMockObjectPartialMocksTests.m */; };
 		03565A4318F05721003AE91E /* OCMockObjectClassMethodMockingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 039F91C516EFB493006C3D70 /* OCMockObjectClassMethodMockingTests.m */; };
 		03565A4418F05721003AE91E /* OCMockObjectProtocolMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA286BFBD8B9D068B41E7EF /* OCMockObjectProtocolMocksTests.m */; };
@@ -356,7 +359,6 @@
 		8DE97C9B22B43EE60098C63F /* OCMArgAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FA2833B48908EAD36444671 /* OCMArgAction.h */; };
 		A02926821CA0725A00594AAF /* TestObjects.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = A02926801CA0725A00594AAF /* TestObjects.xcdatamodeld */; };
 		A06930951CA1BFC900513023 /* TestObjects.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = A02926801CA0725A00594AAF /* TestObjects.xcdatamodeld */; };
-		D31108BA1828DB8700737925 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D31108B81828DB8700737925 /* InfoPlist.strings */; };
 		D31108C41828DBD600737925 /* OCMockObjectPartialMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03AC5C1416DF9FA500D82ECD /* OCMockObjectPartialMocksTests.m */; };
 		D31108C51828DBD600737925 /* OCMockObjectClassMethodMockingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 039F91C516EFB493006C3D70 /* OCMockObjectClassMethodMockingTests.m */; };
 		D31108C61828DBD600737925 /* OCMockObjectForwardingTargetTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0354D71F16F23AF5001766BB /* OCMockObjectForwardingTargetTests.m */; };
@@ -465,7 +467,6 @@
 /* Begin PBXFileReference section */
 		030EF0A814632FD000B04273 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		030EF0B314632FD000B04273 /* OCMock-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMock-Info.plist"; sourceTree = "<group>"; };
-		030EF0B514632FD000B04273 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		030EF0B714632FD000B04273 /* OCMock-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMock-Prefix.pch"; sourceTree = "<group>"; };
 		030EF0B814632FD000B04273 /* OCMock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCMock.h; sourceTree = "<group>"; };
 		030EF0DC14632FF700B04273 /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -474,12 +475,12 @@
 		0322DA64191188D100CACAF1 /* OCMockObjectVerifyAfterRunTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMockObjectVerifyAfterRunTests.m; sourceTree = "<group>"; };
 		0322DA6719118B4600CACAF1 /* OCMVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMVerifier.h; sourceTree = "<group>"; };
 		0322DA6819118B4600CACAF1 /* OCMVerifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMVerifier.m; sourceTree = "<group>"; };
+		033AB1F924F046C7002014AE /* OCMockMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCMockMacros.h; sourceTree = "<group>"; };
 		033E1FF314FEF5E0004456B0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		0354D71F16F23AF5001766BB /* OCMockObjectForwardingTargetTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMockObjectForwardingTargetTests.m; sourceTree = "<group>"; };
 		03565A1D18F05626003AE91E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		03565A3118F0566E003AE91E /* OCMockTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OCMockTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		03565A3518F0566F003AE91E /* OCMockTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMockTests-Info.plist"; sourceTree = "<group>"; };
-		03565A3718F0566F003AE91E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		03565A3B18F0566F003AE91E /* OCMockTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMockTests-Prefix.pch"; sourceTree = "<group>"; };
 		03618D81195B553400389166 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
 		03618D82195B553400389166 /* OCMRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMRecorder.m; sourceTree = "<group>"; };
@@ -582,10 +583,8 @@
 		A02926811CA0725A00594AAF /* TestObjects.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TestObjects.xcdatamodel; sourceTree = "<group>"; };
 		D31108AD1828DB8700737925 /* OCMockLibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OCMockLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		D31108B71828DB8700737925 /* OCMockLibTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMockLibTests-Info.plist"; sourceTree = "<group>"; };
-		D31108B91828DB8700737925 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		D31108BD1828DB8700737925 /* OCMockLibTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMockLibTests-Prefix.pch"; sourceTree = "<group>"; };
 		F0B950F11B0080BE00942C38 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		F0B950F41B0080BE00942C38 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "OCMock iOS/Info.plist"; sourceTree = SOURCE_ROOT; };
 		F0B9510A1B0080D500942C38 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 
@@ -695,9 +694,7 @@
 		030EF0B214632FD000B04273 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				F0B950F41B0080BE00942C38 /* Info.plist */,
 				030EF0B314632FD000B04273 /* OCMock-Info.plist */,
-				030EF0B414632FD000B04273 /* InfoPlist.strings */,
 				030EF0B714632FD000B04273 /* OCMock-Prefix.pch */,
 			);
 			name = "Supporting Files";
@@ -774,7 +771,6 @@
 		03565A3418F0566F003AE91E /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				03565A3618F0566F003AE91E /* InfoPlist.strings */,
 				03565A3518F0566F003AE91E /* OCMockTests-Info.plist */,
 				03565A3B18F0566F003AE91E /* OCMockTests-Prefix.pch */,
 				A02926801CA0725A00594AAF /* TestObjects.xcdatamodeld */,
@@ -805,6 +801,7 @@
 		03B315841463334E0052CD09 /* Core Mocks */ = {
 			isa = PBXGroup;
 			children = (
+				033AB1F924F046C7002014AE /* OCMockMacros.h */,
 				03B3159D146333BF0052CD09 /* OCMockObject.h */,
 				03B3159E146333BF0052CD09 /* OCMockObject.m */,
 				03B3158B146333BF0052CD09 /* OCClassMockObject.h */,
@@ -934,7 +931,6 @@
 			isa = PBXGroup;
 			children = (
 				D31108B71828DB8700737925 /* OCMockLibTests-Info.plist */,
-				D31108B81828DB8700737925 /* InfoPlist.strings */,
 				D31108BD1828DB8700737925 /* OCMockLibTests-Prefix.pch */,
 			);
 			name = "Supporting Files";
@@ -982,6 +978,7 @@
 				2FA2821C9066C5E439288C76 /* OCMMacroState.h in Headers */,
 				2FA28F090622C9DF868CCA8C /* NSValue+OCMAdditions.h in Headers */,
 				2FA28DC9A2D732666124D640 /* OCMBlockArgCaller.h in Headers */,
+				033AB1FA24F046C7002014AE /* OCMockMacros.h in Headers */,
 				2FA28BCF08C1CBC133E8E84E /* OCMArgAction.h in Headers */,
 				2FA28C1FE2E8E2C114E3FA54 /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
 			);
@@ -1003,6 +1000,7 @@
 				03C7BF0B195DA2F200A545DD /* OCMInvocationStub.h in Headers */,
 				03B315BF146333BF0052CD09 /* OCClassMockObject.h in Headers */,
 				03B315C9146333BF0052CD09 /* OCMBlockCaller.h in Headers */,
+				033AB1FB24F046C7002014AE /* OCMockMacros.h in Headers */,
 				03E0FAD81B93C00B000C5096 /* OCMBlockArgCaller.h in Headers */,
 				03C7BF11195DAB5300A545DD /* OCMExpectationRecorder.h in Headers */,
 				03B315CE146333BF0052CD09 /* OCMBoxedReturnValueProvider.h in Headers */,
@@ -1069,6 +1067,7 @@
 				817EB15A1BD765130047E85A /* NSValue+OCMAdditions.h in Headers */,
 				817EB15B1BD765130047E85A /* OCMFunctions.h in Headers */,
 				817EB15C1BD765130047E85A /* OCMBlockArgCaller.h in Headers */,
+				033AB1FD24F046C7002014AE /* OCMockMacros.h in Headers */,
 				817EB15D1BD765130047E85A /* OCMArgAction.h in Headers */,
 				2FA28806443827E286F12F6F /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
 			);
@@ -1113,6 +1112,7 @@
 				8DE97C9822B43EE60098C63F /* NSValue+OCMAdditions.h in Headers */,
 				8DE97C9922B43EE60098C63F /* OCMFunctions.h in Headers */,
 				8DE97C9A22B43EE60098C63F /* OCMBlockArgCaller.h in Headers */,
+				033AB1FE24F046C7002014AE /* OCMockMacros.h in Headers */,
 				8DE97C9B22B43EE60098C63F /* OCMArgAction.h in Headers */,
 				2FA2883A0BD4BF6A03AAB49C /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
 			);
@@ -1157,6 +1157,7 @@
 				F0B951491B00810C00942C38 /* NSValue+OCMAdditions.h in Headers */,
 				F0B9514A1B00810C00942C38 /* OCMFunctions.h in Headers */,
 				2FA28B7BDB3319A499E90525 /* OCMBlockArgCaller.h in Headers */,
+				033AB1FC24F046C7002014AE /* OCMockMacros.h in Headers */,
 				2FA280E60213BA09F007C173 /* OCMArgAction.h in Headers */,
 				2FA28AFBD67EAB9DD1F23BF5 /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
 			);
@@ -1342,7 +1343,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				030EF0B614632FD000B04273 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1352,7 +1352,6 @@
 			files = (
 				A02926821CA0725A00594AAF /* TestObjects.xcdatamodeld in Resources */,
 				03CED2E22390770C001845CC /* OCHamcrest.framework.dSYM in Resources */,
-				03565A3818F0566F003AE91E /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1374,7 +1373,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D31108BA1828DB8700737925 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1691,33 +1689,6 @@
 		};
 /* End PBXTargetDependency section */
 
-/* Begin PBXVariantGroup section */
-		030EF0B414632FD000B04273 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				030EF0B514632FD000B04273 /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		03565A3618F0566F003AE91E /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				03565A3718F0566F003AE91E /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		D31108B81828DB8700737925 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				D31108B91828DB8700737925 /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		030EF0D014632FD000B04273 /* Debug */ = {
 			isa = XCBuildConfiguration;

diff --git a/Source/OCMock/NSInvocation+OCMAdditions.m b/Source/OCMock/NSInvocation+OCMAdditions.m
@@ -15,12 +15,10 @@
  */
 
 #import <objc/runtime.h>
-#import <Availability.h>
-#import <TargetConditionals.h>
 #import "NSInvocation+OCMAdditions.h"
+#import "OCMArg.h"
 #import "OCMFunctionsPrivate.h"
 #import "NSMethodSignature+OCMAdditions.h"
-#import "OCMArg.h"
 
 #if (TARGET_OS_OSX && (!defined(__MAC_10_10) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_10)) || \
     (TARGET_OS_IPHONE && (!defined(__IPHONE_8_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0))

diff --git a/Source/OCMock/NSMethodSignature+OCMAdditions.m b/Source/OCMock/NSMethodSignature+OCMAdditions.m
@@ -14,9 +14,9 @@
  *  under the License.
  */
 
+#import <objc/runtime.h>
 #import "NSMethodSignature+OCMAdditions.h"
 #import "OCMFunctionsPrivate.h"
-#import <objc/runtime.h>
 
 
 @implementation NSMethodSignature(OCMAdditions)

diff --git a/Source/OCMock/NSObject+OCMAdditions.m b/Source/OCMock/NSObject+OCMAdditions.m
@@ -14,9 +14,10 @@
  *  under the License.
  */
 
+#import <objc/runtime.h>
 #import "NSObject+OCMAdditions.h"
 #import "NSMethodSignature+OCMAdditions.h"
-#import <objc/runtime.h>
+
 
 @implementation NSObject(OCMAdditions)
 

diff --git a/Source/OCMock/NSValue+OCMAdditions.m b/Source/OCMock/NSValue+OCMAdditions.m
@@ -17,6 +17,7 @@
 #import "NSValue+OCMAdditions.h"
 #import "OCMFunctionsPrivate.h"
 
+
 @implementation NSValue(OCMAdditions)
 
 static NSNumber *OCMNumberForValue(NSValue *value)

diff --git a/Source/OCMock/OCClassMockObject.h b/Source/OCMock/OCClassMockObject.h
@@ -14,7 +14,7 @@
  *  under the License.
  */
 
-#import <OCMock/OCMockObject.h>
+#import "OCMockObject.h"
 
 @interface OCClassMockObject : OCMockObject 
 

diff --git a/Source/OCMock/OCClassMockObject.m b/Source/OCMock/OCClassMockObject.m
@@ -16,10 +16,11 @@
 
 #import <objc/runtime.h>
 #import "OCClassMockObject.h"
-#import "NSObject+OCMAdditions.h"
-#import "OCMFunctionsPrivate.h"
 #import "OCMInvocationStub.h"
+#import "OCMFunctionsPrivate.h"
 #import "NSMethodSignature+OCMAdditions.h"
+#import "NSObject+OCMAdditions.h"
+
 
 @interface OCClassMockObjectInstanceVars : NSObject
 @property (nonatomic) Class mockedClass;

diff --git a/Source/OCMock/OCMArg.m b/Source/OCMock/OCMArg.m
@@ -15,10 +15,11 @@
  */
 
 #import <objc/runtime.h>
-#import <OCMock/OCMArg.h>
-#import <OCMock/OCMConstraint.h>
-#import "OCMPassByRefSetter.h"
+#import "OCMArg.h"
 #import "OCMBlockArgCaller.h"
+#import "OCMConstraint.h"
+#import "OCMPassByRefSetter.h"
+
 
 @implementation OCMArg
 

diff --git a/Source/OCMock/OCMBlockCaller.h b/Source/OCMock/OCMBlockCaller.h
@@ -16,7 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-
 @interface OCMBlockCaller : NSObject 
 {
 	void (^block)(NSInvocation *);

diff --git a/Source/OCMock/OCMConstraint.h b/Source/OCMock/OCMConstraint.h
@@ -16,7 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-
 @interface OCMConstraint : NSObject 
 
 + (instancetype)constraint;

diff --git a/Source/OCMock/OCMConstraint.m b/Source/OCMock/OCMConstraint.m
@@ -1,3 +1,4 @@
+#import <limits.h>
 /*
  *  Copyright (c) 2007-2020 Erik Doernenburg and contributors
  *
@@ -14,7 +15,7 @@
  *  under the License.
  */
 
-#import <OCMock/OCMConstraint.h>
+#import "OCMConstraint.h"
 
 
 @implementation OCMConstraint
@@ -29,7 +30,7 @@ - (BOOL)evaluate:(id)value
 	return NO;
 }
 
-- (id)copyWithZone:(struct _NSZone *)zone
+- (id)copyWithZone:(struct _NSZone *)zone __unused
 {
     return [self retain];
 }

diff --git a/Source/OCMock/OCMExpectationRecorder.h b/Source/OCMock/OCMExpectationRecorder.h
@@ -14,7 +14,7 @@
  *  under the License.
  */
 
-#import <OCMock/OCMock.h>
+#import "OCMStubRecorder.h"
 
 @interface OCMExpectationRecorder : OCMStubRecorder
 

diff --git a/Source/OCMock/OCMExpectationRecorder.m b/Source/OCMock/OCMExpectationRecorder.m
@@ -15,8 +15,10 @@
  */
 
 #import "OCMExpectationRecorder.h"
+#import "OCMockObject.h"
 #import "OCMInvocationExpectation.h"
 
+
 @implementation OCMExpectationRecorder
 
 #pragma mark  Initialisers, description, accessors, etc.

diff --git a/Source/OCMock/OCMFunctions.m b/Source/OCMock/OCMFunctions.m
@@ -16,9 +16,9 @@
 
 #import <objc/runtime.h>
 #import "OCMFunctionsPrivate.h"
-#import "OCMLocation.h"
 #import "OCClassMockObject.h"
 #import "OCPartialMockObject.h"
+#import "OCMLocation.h"
 
 
 #pragma mark  Known private API

diff --git a/Source/OCMock/OCMInvocationMatcher.m b/Source/OCMock/OCMInvocationMatcher.m
@@ -15,12 +15,12 @@
  */
 
 #import <objc/runtime.h>
-#import <OCMock/OCMArg.h>
-#import <OCMock/OCMConstraint.h>
-#import "OCMPassByRefSetter.h"
-#import "NSInvocation+OCMAdditions.h"
 #import "OCMInvocationMatcher.h"
+#import "OCMArg.h"
+#import "OCMConstraint.h"
+#import "OCMPassByRefSetter.h"
 #import "OCMFunctionsPrivate.h"
+#import "NSInvocation+OCMAdditions.h"
 
 
 @interface NSObject(HCMatcherDummy)

diff --git a/Source/OCMock/OCMInvocationStub.m b/Source/OCMock/OCMInvocationStub.m
@@ -21,6 +21,7 @@
 
 #define UNSET_RETURN_VALUE_MARKER ((id)0x01234567)
 
+
 @implementation OCMInvocationStub
 
 - (id)init

diff --git a/Source/OCMock/OCMLocation.h b/Source/OCMock/OCMLocation.h
@@ -17,7 +17,6 @@
 #import <Foundation/Foundation.h>
 #import "OCMFunctions.h"
 
-
 @interface OCMLocation : NSObject
 {
     id          testCase;

diff --git a/Source/OCMock/OCMLocation.m b/Source/OCMock/OCMLocation.m
@@ -16,6 +16,7 @@
 
 #import "OCMLocation.h"
 
+
 @implementation OCMLocation
 
 + (instancetype)locationWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine