Add SPM support

.gitignore

@@ -23,3 +23,4 @@ output
 xcodebuild.log
 xcodebuild_error.log
 
+.swiftpm

.travis.yml

@@ -1,3 +1,3 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode11.3
 script: make ci

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v7.0.3"
+github "Quick/Nimble" "v8.0.5"
 github "specta/expecta" "v1.0.6"

Kiwi.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.8'
 
   s.framework = 'XCTest'
-  s.source_files = 'Classes/**/*.{h,m}'
+  s.source_files = 'Sources/Kiwi/**/*.{h,m}'
   s.requires_arc = true
   s.prefix_header_contents = '#import <XCTest/XCTest.h>'
 

Kiwi.xcodeproj/project.pbxproj

@@ -247,6 +247,10 @@
 		4AE030C81AEB494400556381 /* KWValueTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C6FD2311782A290068BBC8 /* KWValueTest.m */; };
 		4AE030C91AEB494400556381 /* NSNumber_KiwiAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9C69F7190CA6EE002C4DC0 /* NSNumber_KiwiAdditionsTests.m */; };
 		4AE030CA1AEB4DCF00556381 /* NSObject+KiwiSpyAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F982CD916A802920030A0B1 /* NSObject+KiwiSpyAdditions.m */; };
+		4B9314A523D0E83C007A295C /* KWNotificationMatcherTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B9314A423D0E83C007A295C /* KWNotificationMatcherTest.m */; };
+		4B9314A623D0E83C007A295C /* KWNotificationMatcherTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B9314A423D0E83C007A295C /* KWNotificationMatcherTest.m */; };
+		4B9314A823D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B9314A723D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m */; };
+		4B9314A923D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B9314A723D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m */; };
 		50ACAF651BBA28D000F29B0F /* DoNotUseMe.m in Sources */ = {isa = PBXBuildFile; fileRef = 50ACAF641BBA28D000F29B0F /* DoNotUseMe.m */; };
 		50ACAF661BBA28D000F29B0F /* DoNotUseMe.m in Sources */ = {isa = PBXBuildFile; fileRef = 50ACAF641BBA28D000F29B0F /* DoNotUseMe.m */; };
 		CE0736B41B8577140023EBEA /* Expecta.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE0736B31B8577140023EBEA /* Expecta.framework */; };
@@ -588,6 +592,8 @@
 		4AE02FD81AEB46D000556381 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4AE33458195820DC00CDE895 /* KWMessagePattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMessagePattern.h; sourceTree = "<group>"; };
 		4AE33459195820DC00CDE895 /* KWMessagePattern.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMessagePattern.m; sourceTree = "<group>"; };
+		4B9314A423D0E83C007A295C /* KWNotificationMatcherTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWNotificationMatcherTest.m; sourceTree = "<group>"; };
+		4B9314A723D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWNotificationMatcherFunctionalTests.m; sourceTree = "<group>"; };
 		4BA52D0015487F0C00FC957B /* KWCaptureTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWCaptureTest.m; sourceTree = "<group>"; };
 		4E3C5DB01716C34900835B62 /* KWRegularExpressionPatternMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWRegularExpressionPatternMatcher.h; sourceTree = "<group>"; };
 		4E3C5DB11716C34900835B62 /* KWRegularExpressionPatternMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWRegularExpressionPatternMatcher.m; sourceTree = "<group>"; };
@@ -1222,6 +1228,7 @@
 				CE0736B71B8577490023EBEA /* KWExpectaTests.m */,
 				89F9CB7B16B1C2C400E87D34 /* KWFunctionalTests.m */,
 				4A4AA324195B7C4E00423CD6 /* KWMessagePatternFunctionalTests.m */,
+				4B9314A723D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m */,
 				CE39E6171B857CE000736C33 /* KWObjCNimbleTests.m */,
 				CE7EFF9B1B847AD700FFE6D6 /* KWObjCXCTestAssertionTests.m */,
 				CE39E61A1B857DE300736C33 /* KWSwiftNimbleTests.swift */,
@@ -1343,6 +1350,7 @@
 				F553B29D11755A00004FCA2E /* KWInequalityMatcherTest.m */,
 				F5C36E91115C9F0700425FDA /* KWReceiveMatcherTest.m */,
 				4E3C5DB71716C68000835B62 /* KWRegularExpressionPatternMatcherTest.m */,
+				4B9314A423D0E83C007A295C /* KWNotificationMatcherTest.m */,
 				F553B6641175D48C004FCA2E /* KWRespondToSelectorMatcherTest.m */,
 				A385CAE713AA7EA200DCA951 /* KWUserDefinedMatcherTest.m */,
 				C931D36D18AB2DEB005BC184 /* KWBeZeroMatcherTest.m */,
@@ -1665,33 +1673,35 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
 				LastTestingUpgradeCheck = 0600;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1030;
 				ORGANIZATIONNAME = "Allen Ding";
 				TargetAttributes = {
 					4AE02FBC1AEB45EB00556381 = {
 						CreatedOnToolsVersion = 6.3;
 					};
 					4AE02FC61AEB45EB00556381 = {
 						CreatedOnToolsVersion = 6.3;
+						LastSwiftMigration = 1030;
 					};
 					CE87C4221AF194E900310C07 = {
 						CreatedOnToolsVersion = 6.3.1;
 					};
 					CE87C42C1AF194EA00310C07 = {
 						CreatedOnToolsVersion = 6.3.1;
+						LastSwiftMigration = 1130;
 					};
 				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Kiwi" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
 				en,
+				de,
+				ja,
+				fr,
+				Base,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
@@ -1844,6 +1854,7 @@
 				4AE030951AEB494400556381 /* KWBeTrueMatcherTest.m in Sources */,
 				4AE030961AEB494400556381 /* KWBeWithinMatcherTest.m in Sources */,
 				4AE030971AEB494400556381 /* KWBlockRaiseMatcherTest.m in Sources */,
+				4B9314A623D0E83C007A295C /* KWNotificationMatcherTest.m in Sources */,
 				4AE030981AEB494400556381 /* KWChangeMatcherTest.m in Sources */,
 				4AE030991AEB494400556381 /* KWConformToProtocolMatcherTest.m in Sources */,
 				CE39E61C1B857DE300736C33 /* KWSwiftNimbleTests.swift in Sources */,
@@ -1876,6 +1887,7 @@
 				4AE030B11AEB494400556381 /* Carrier.m in Sources */,
 				4AE030B21AEB494400556381 /* Cruiser.m in Sources */,
 				4AE030B31AEB494400556381 /* Engine.m in Sources */,
+				4B9314A923D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m in Sources */,
 				CE7EFF9D1B847AD700FFE6D6 /* KWObjCXCTestAssertionTests.m in Sources */,
 				4AE030B41AEB494400556381 /* Fighter.m in Sources */,
 				4AE030B51AEB494400556381 /* Galaxy.m in Sources */,
@@ -2009,6 +2021,7 @@
 				CE87C4FB1AF1994100310C07 /* KWBeWithinMatcherTest.m in Sources */,
 				CE87C4FC1AF1994100310C07 /* KWBlockRaiseMatcherTest.m in Sources */,
 				CE87C4FD1AF1994100310C07 /* KWChangeMatcherTest.m in Sources */,
+				4B9314A523D0E83C007A295C /* KWNotificationMatcherTest.m in Sources */,
 				CE87C4FE1AF1994100310C07 /* KWConformToProtocolMatcherTest.m in Sources */,
 				CE87C4FF1AF1994100310C07 /* KWContainMatcherTest.m in Sources */,
 				CE39E61B1B857DE300736C33 /* KWSwiftNimbleTests.swift in Sources */,
@@ -2041,6 +2054,7 @@
 				CE87C5171AF1994200310C07 /* Cruiser.m in Sources */,
 				CE87C5181AF1994200310C07 /* Engine.m in Sources */,
 				CE87C5191AF1994200310C07 /* Fighter.m in Sources */,
+				4B9314A823D0F4C6007A295C /* KWNotificationMatcherFunctionalTests.m in Sources */,
 				CE7EFF9C1B847AD700FFE6D6 /* KWObjCXCTestAssertionTests.m in Sources */,
 				CE87C51A1AF1994200310C07 /* Galaxy.m in Sources */,
 				CE87C51D1AF1994200310C07 /* Robot.m in Sources */,
@@ -2211,7 +2225,7 @@
 				PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -2244,7 +2258,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -2256,11 +2270,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -2303,11 +2319,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -2456,7 +2474,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -2486,7 +2504,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

Kiwi.xcodeproj/xcshareddata/xcschemes/Kiwi-OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1030"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4AE02FBC1AEB45EB00556381"
+            BuildableName = "Kiwi.framework"
+            BlueprintName = "Kiwi-OSX"
+            ReferencedContainer = "container:Kiwi.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -56,7 +66,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Kiwi.xcodeproj/xcshareddata/xcschemes/Kiwi-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1030"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CE87C4221AF194E900310C07"
+            BuildableName = "Kiwi.framework"
+            BlueprintName = "Kiwi-iOS"
+            ReferencedContainer = "container:Kiwi.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -56,7 +66,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Package.swift

@@ -0,0 +1,69 @@
+// swift-tools-version: 5.6
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Kiwi",
+    platforms: [
+        .iOS(.v9),
+        .macOS(.v10_10)
+    ],
+    products: [
+        .library(name: "Kiwi", targets: ["Kiwi"])
+    ],
+    dependencies: [
+        .package(
+            url: "https://github.com/Quick/Nimble", "8.0.0"..<"9.0.0"
+        )
+    ],
+    targets: [
+        .target(
+            name: "Kiwi",
+            cSettings: [
+                .headerSearchPath("./**")
+            ]
+        ),
+        .target(
+            name: "Test Classes",
+            dependencies: [
+                "Kiwi"
+            ],
+            publicHeadersPath: "./",
+            cSettings: [
+                .headerSearchPath("./../Kiwi/**")
+            ]
+        ),
+        .testTarget(
+            name: "KiwiTests",
+            dependencies: [
+                "Kiwi",
+                "Nimble",
+                "Test Classes"
+            ],
+            cSettings: [
+                .headerSearchPath("./**"),
+                .headerSearchPath("../../Sources/Kiwi/**")
+            ]
+        ),
+        .testTarget(
+            name: "KiwiTestsNoArc",
+            dependencies: [
+                "Kiwi",
+                "Test Classes"
+            ],
+            cSettings: [
+                .headerSearchPath("../KiwiTests/**"),
+                .headerSearchPath("../../Sources/Kiwi/**"),
+                .unsafeFlags(["-fno-objc-arc"])
+            ]
+        ),
+        .testTarget(
+            name: "KiwiTestsSwift",
+            dependencies: [
+                "Kiwi",
+                "Nimble"
+            ]
+        )
+    ]
+)

Classes/Matchers/KWNotificationMatcher.m → Sources/Kiwi/Matchers/KWNotificationMatcher.m

@@ -45,16 +45,32 @@ - (void)addObserver {
                                         if (self.evaluationBlock) {
                                             self.evaluationBlock(note);
                                         }
+                                        if (self.didReceiveNotification) {
+                                            [self removeObserver];
+                                        }
                                     }];
 }
 
+- (void)removeObserver {
+    if (self.observer) {
+        [[NSNotificationCenter defaultCenter] removeObserver:self.observer];
+        self.observer = nil;
+    }
+}
+
 #pragma mark - Matching
 
 - (BOOL)evaluate {
-    [[NSNotificationCenter defaultCenter] removeObserver:self.observer];
+    if (!self.willEvaluateMultipleTimes) {
+        [self removeObserver];
+    }
     return self.didReceiveNotification;
 }
 
+- (void)dealloc {
+    [self removeObserver];
+}
+
 - (BOOL)shouldBeEvaluatedAtEndOfExample {
     return YES;
 }