feature/update ocmock

.gitignore

@@ -2,5 +2,6 @@
 xcuserdata
 *.xcworkspace
 .idea
+.build
 build
 Carthage

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode12.3
 before_install:
     - gem install xcpretty -N --quiet
 script: make ci

CONTRIBUTING.md

@@ -43,7 +43,12 @@ This project adheres to the [Contributor Covenant 1.2](http://contributor-covena
 
 Please remember that OCMock has been around for 10+ years. Some of the coding conventions used in OCMock may contradict modern guidelines. However, in the interest of keeping the codebase consistent, please respect the conventions used. In particular:
 
-* Opening and closing braces always go on a separate line.
+* Use four spaces for indentation.
+* Opening and closing braces always go on a separate line (except with blocks).
 * No spaces between keywords like `if` and `for` and the following bracket.
 * No underscores for instance variables.
 * OCMock itself (framework and library) does not use ARC; retains and releases must be sent manually. The unit tests, however, do use ARC.
+
+The repository contains a `.clang-format` file in the actual source directory. This should get you mostly there. Please apply the formatting defined in the config file only to code you add or modify. Please do not apply the formatting to entire files as there are still some inconsistencies in parts of the codebase and certain cases are not formatted correctly by clang-format.
+
+

Examples/iPhoneExample/Classes/iPhoneExampleAppDelegate.h

@@ -14,8 +14,8 @@
     UINavigationController *navigationController;
 }
 
-@property (nonatomic, retain) IBOutlet UIWindow *window;
-@property (nonatomic, retain) IBOutlet UINavigationController *navigationController;
+@property (nonatomic, strong) IBOutlet UIWindow *window;
+@property (nonatomic, strong) IBOutlet UINavigationController *navigationController;
 
 @end
 

Makefile

@@ -1,35 +1,78 @@
-# This makefile is mainly intended for use on the CI server (Travis). It
-# requires xcpretty to be installed.
+# This makefile has the following top-level targets:
+#   - ci    used by Travis for continuous integration
+#   - dist  used to build the binary distribution
+#
+# Note that the dist target uses git checkout to copy the source into the
+# product directory. This means you should make sure that you don't have 
+# uncommited local changes when building a distribution.
 
-# If you are trying to build a release locally consider using the build.rb
-# script in the Tools directory instead.
+BUILD_DIR   = $(CURDIR)/Build
+PRODUCT_DIR = $(BUILD_DIR)/Product
+XCODECI     = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockCI.xcconfig" -destination-timeout 600
+XCODEDIST   = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockDist.xcconfig"
+SHELL       = /bin/bash -e -o pipefail
 
+.PHONY: macos ioslib ios tvos watchos sourcecode product dmg swiftpm carthage
+
+clean:
+	rm -rf "$(CURDIR)/Build"
 
-BUILD_DIR = OBJROOT="$(CURDIR)/build" SYMROOT="$(CURDIR)/build"
-SHELL = /bin/bash -e -o pipefail
-IOS32 = -scheme OCMockLib -sdk iphonesimulator -destination 'name=iPhone 5' $(BUILD_DIR)
-IOS64 = -scheme OCMockLib -sdk iphonesimulator -destination 'name=iPhone 5s' $(BUILD_DIR)
-MACOSX = -scheme OCMock -sdk macosx $(BUILD_DIR)
-XCODEBUILD = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj"
 
-ci: clean test
+ci: ci-macos ci-ios swiftpm
+
+ci-macos:
+	@echo "Building macOS framework and running tests..."
+	$(XCODECI) -scheme OCMock -sdk macosx test | xcpretty -c
+
+ci-ios:
+	@echo "Building iOS library and running tests..."
+	$(XCODECI) -scheme OCMockLib -destination 'platform=iOS Simulator,OS=latest,name=iPhone 11' test | xcpretty -c
+
+
+dist: product sourcecode dmg
+
+macos:
+	@echo "** Building macOS framework..."
+	$(XCODEDIST) -scheme OCMock install INSTALL_PATH="/macOS" | xcpretty -c
+
+ioslib:
+	@echo "** Building iOS library..."
+	$(XCODEDIST) -target OCMockLib -sdk iphonesimulator install INSTALL_PATH="/iOS library" | xcpretty -c
+
+ios:
+	@echo "** Building iOS framework..."
+	$(XCODEDIST) -target "OCMock iOS" -sdk iphonesimulator install INSTALL_PATH="/iOS" | xcpretty -c
+
+tvos:
+	@echo "** Building tvOS framework..."
+	$(XCODEDIST) -target "OCMock tvOS" -sdk appletvsimulator install INSTALL_PATH="/tvOS" | xcpretty -c
+
+watchos:
+	@echo "** Building watchOS framework..."
+	$(XCODEDIST) -target "OCMock watchOS" -sdk watchsimulator install INSTALL_PATH="/watchOS" | xcpretty -c
+
+sourcecode:
+	@echo "** Checking out source code..."
+	mkdir -p "$(PRODUCT_DIR)"
+	git archive master | tar -x -C "$(PRODUCT_DIR)" Source
+
+product: macos ioslib ios tvos watchos
+	@echo "** Verifying build products..."
+	Tools/buildcheck.rb $(PRODUCT_DIR)
+
+dmg: 
+	@echo "** Creating disk image..."
+	Tools/makedmg.rb $(PRODUCT_DIR) $(BUILD_DIR)
 
-clean:
-	$(XCODEBUILD) clean
-	rm -rf "$(CURDIR)/build"
 
-test: test-ios test-macosx
+swiftpm:
+	echo "** Testing Swift Package Manager Distribution"
+	swift build
+	swift test
 
-test-ios: test-ios32 test-ios64
 
-test-ios32:
-	@echo "Running 32-bit iOS tests..."
-	$(XCODEBUILD) $(IOS32) test | xcpretty -c
+carthage:
+	XCODE_XCCONFIG_FILE="$(CURDIR)/Source/Carthage.xcconfig" carthage build --no-skip-current --project-directory "$(CURDIR)/Source"
+	XCODE_XCCONFIG_FILE="$(CURDIR)/Source/Carthage.xcconfig" carthage archive OCMock
 
-test-ios64:
-	@echo "Running 64-bit iOS tests..."
-	$(XCODEBUILD) $(IOS64) test | xcpretty -c
 
-test-macosx:
-	@echo "Running OS X tests..."
-	$(XCODEBUILD) $(MACOSX) test | xcpretty -c

OCMock.podspec

@@ -1,34 +1,39 @@
 Pod::Spec.new do |s|
-  s.name                  = "OCMock"
-  s.version               = "3.4.1"
-  
-  s.summary               = "Mock objects for Objective-C"
-  s.description           = <<-DESC
+  s.name                      = "OCMock"
+  s.version                   = "3.8.1"
+
+  s.summary                   = "Mock objects for Objective-C"
+  s.description               = <<-DESC
                         OCMock is an Objective-C implementation of mock objects. It provides
                         stubs that return pre-determined values for specific method invocations,
                         dynamic mocks that can be used to verify interaction patterns, and
                         partial mocks to overwrite selected methods of existing objects.
                         DESC
-
-  s.homepage              = "http://ocmock.org"
-  s.documentation_url     = "http://ocmock.org/reference/"
-  s.license               = { :type => "Apache 2.0", :file => "License.txt" }
 
-  s.author                = { "Erik Doernenburg" => "[email protected]" }
-  s.social_media_url      = "http://twitter.com/erikdoe"
-
-  s.source                = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.4.1" }
-  s.source_files          = "Source/OCMock/*.{h,m}"
+  s.homepage                  = "http://ocmock.org"
+  s.documentation_url         = "http://ocmock.org/reference/"
+  s.license                   = { :type => "Apache 2.0", :file => "License.txt" }
+
+  s.author                    = { "Erik Doernenburg" => "[email protected]" }
+  s.social_media_url          = "https://twitter.com/erikdoe"
+
+  s.source                    = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.8.1" }
+  s.source_files              = "Source/OCMock/*.{h,m}"
+
+  s.requires_arc              = false
+  s.osx.deployment_target     = '10.10'
+  s.ios.deployment_target     = '9.0'
+  s.tvos.deployment_target    = '9.0'
+  s.watchos.deployment_target = '4.0'
+  s.osx.framework             = 'XCTest'
+  s.ios.framework             = 'XCTest'
+  s.tvos.framework            = 'XCTest'
 
-  s.requires_arc          = false
-  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.6'
-  s.tvos.deployment_target = '9.0'
-
-  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"]
-                              .map { |file| "Source/OCMock/" + file }
-
+  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",
+                                 "OCMockMacros.h" 
+								]
+                                .map { |file| "Source/OCMock/" + file }
 end

Package.swift

@@ -0,0 +1,63 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "OCMock",
+    defaultLocalization: "en",
+    products: [
+        .library(
+            name: "OCMock",
+            targets: ["OCMock"]
+        )
+    ],
+    targets: [
+        .target(name: "OCMock",
+            dependencies: [],
+            path: "Source",
+            exclude: [
+                "Carthage/",
+                "Changes.txt",
+                "OCMock/OCMock-Info.plist",
+                "OCMock/OCMock-Prefix.pch",
+                "OCMockTests/",
+                "Cartfile",
+                "Cartfile.resolved",
+                "OCMockLibTests/OCMockLibTests-Info.plist",
+                "OCMockLib/OCMockLib-Prefix.pch",
+                "OCMockLibTests/OCMockLibTests-Prefix.pch",
+                "Carthage.xcconfig",
+                "OCMockDist.xcconfig",
+                "OCMockCI.xcconfig",
+            ],
+            publicHeadersPath: ".",
+            cSettings: [
+                .headerSearchPath("./"),
+                .unsafeFlags(["-fno-objc-arc"])
+            ],
+            cxxSettings: nil,
+            swiftSettings: nil,
+            linkerSettings: nil
+        ),
+        .testTarget(
+            name: "swift-test",
+            dependencies: [
+                "OCMock",
+            ],
+            path: "SwiftPMTests/swift",
+                cSettings: [
+                .headerSearchPath("../"),
+            ]
+        ),
+        .testTarget(
+            name: "objc-test",
+            dependencies: [
+             "OCMock",
+            ],
+            path: "SwiftPMTests/objc",
+            cSettings: [
+              .headerSearchPath("../"),
+            ]
+        )
+    ]
+)

Source/.clang-format

@@ -0,0 +1,38 @@
+BasedOnStyle:  WebKit
+#AlignConsecutiveDeclarations: true  (only in instance var declarations)
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterControlStatement: Always
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterObjCDeclaration: true
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeWhile:     true
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+IncludeCategories:
+  - Regex:           '^<[a-z]*'
+    Priority:        -4
+  - Regex:           '^<NS*'
+    Priority:        -3
+  - Regex:           '^<XC*'
+    Priority:        -2
+  - Regex:           '^"NS*'
+    Priority:        -1
+  - Regex:           '.*'
+    Priority:        4
+IndentCaseLabels: true
+MaxEmptyLinesToKeep: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 50
+PenaltyBreakBeforeFirstCallParameter: 50
+PointerAlignment: Right
+SpaceBeforeParens: Never

Source/Cartfile

@@ -0,0 +1 @@
+github "hamcrest/OCHamcrest" ~> 7.0

Source/Cartfile.resolved

@@ -0,0 +1 @@
+github "hamcrest/OCHamcrest" "v7.2.0"

Source/Carthage.xcconfig

@@ -0,0 +1,20 @@
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+// This seems to be necessary now that we link against XCTest, which does
+// not include bitcode. 
+
+ENABLE_BITCODE = NO
+
+// The following is a workaround for an issue with Carthage and Xcode 12.3.
+// https://github.com/Carthage/Carthage/issues/3019#issuecomment-665136323
+//
+// Unlike the description in the Github issue, there is no shell
+// script. You have to make sure that Carthage uses this xcconfig file, e.g.
+//
+// XCODE_XCCONFIG_FILE=Carthage.xcconfig carthage build --no-skip-current
+//
+// As far as I understand this workaround only works for Intel dev machines.
+
+EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8
+EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))