Merge pull request #8 from zacwest/swift3

Swift 3
zacwest · Jan 21, 2017 · a2679c2 · a2679c2
2 parents 67c9ff7 + de7ddce
commit a2679c2
Show file tree

Hide file tree

Showing 339 changed files with 7,767 additions and 3,812 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.0 (2017-01-21)
+
+Update to Swift 3.
+
 # 2.0 (2015-12-13)
 
 Swift support! You will need to add the `ZSWTaggedString/Swift` dependency for this. This provides a cleaner API for setting attributes for tags, for example:

diff --git a/Example/.swift_version b/Example/.swift_version
@@ -0,0 +1 @@
+3.0
diff --git a/Example/Podfile b/Example/Podfile
@@ -52,7 +52,7 @@ post_install do |representation|
 end
 
 
-target 'ZSWTaggedString', :exclusive => true do
+target 'ZSWTaggedString' do
   pod "ZSWTaggedString", :path => "../"
   pod "ZSWTaggedString/Swift", :path => "../"
 

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,8 +1,8 @@
 PODS:
   - Expecta (1.0.5)
-  - Nimble (3.0.0)
-  - OCMock (3.2)
-  - Quick (0.8.0)
+  - Nimble (5.1.1)
+  - OCMock (3.4)
+  - Quick (1.0.0)
   - Specta (1.0.5)
   - ZSWTaggedString (2.0):
     - ZSWTaggedString/Core (= 2.0)
@@ -21,14 +21,16 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   ZSWTaggedString:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
-  Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
-  OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
-  Quick: 563d0f6ec5f72e394645adb377708639b7dd38ab
+  Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
+  OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
+  Quick: 8024e4a47e6cc03a9d5245ef0948264fc6d27cff
   Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
-  ZSWTaggedString: 1dfc880e7cfcc25db893053e0c6fd8c021ff5615
+  ZSWTaggedString: 0c3801de9accd36c3b925038cee1ecc95d94d8e5
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 3e8e33953f0073437731a654c10dcc1880b9439e
+
+COCOAPODS: 1.2.0.beta.1
diff --git a/Example/Pods/Headers/Private/Expecta/EXPBlockDefinedMatcher.h b/Example/Pods/Headers/Private/Expecta/EXPBlockDefinedMatcher.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPDefines.h b/Example/Pods/Headers/Private/Expecta/EXPDefines.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPDoubleTuple.h b/Example/Pods/Headers/Private/Expecta/EXPDoubleTuple.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPExpect.h b/Example/Pods/Headers/Private/Expecta/EXPExpect.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPFloatTuple.h b/Example/Pods/Headers/Private/Expecta/EXPFloatTuple.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatcher.h b/Example/Pods/Headers/Private/Expecta/EXPMatcher.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatcherHelpers.h b/Example/Pods/Headers/Private/Expecta/EXPMatcherHelpers.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beCloseTo.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beCloseTo.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beFalsy.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beFalsy.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beGreaterThan.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beGreaterThan.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beGreaterThanOrEqualTo.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beGreaterThanOrEqualTo.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beIdenticalTo.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beIdenticalTo.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beInTheRangeOf.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beInTheRangeOf.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beInstanceOf.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beInstanceOf.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beKindOf.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beKindOf.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beLessThan.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beLessThan.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beLessThanOrEqualTo.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beLessThanOrEqualTo.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beNil.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beNil.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beSubclassOf.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beSubclassOf.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beSupersetOf.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beSupersetOf.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beTruthy.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beTruthy.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+beginWith.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+beginWith.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+conformTo.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+conformTo.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+contain.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+contain.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+endWith.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+endWith.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+equal.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+equal.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+haveCountOf.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+haveCountOf.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+match.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+match.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+postNotification.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+postNotification.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+raise.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+raise.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+raiseWithReason.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+raiseWithReason.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers+respondTo.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers+respondTo.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPMatchers.h b/Example/Pods/Headers/Private/Expecta/EXPMatchers.h
diff --git a/Example/Pods/Headers/Private/Expecta/EXPUnsupportedObject.h b/Example/Pods/Headers/Private/Expecta/EXPUnsupportedObject.h
diff --git a/Example/Pods/Headers/Private/Expecta/Expecta.h b/Example/Pods/Headers/Private/Expecta/Expecta.h
diff --git a/Example/Pods/Headers/Private/Expecta/ExpectaObject.h b/Example/Pods/Headers/Private/Expecta/ExpectaObject.h
diff --git a/Example/Pods/Headers/Private/Expecta/ExpectaSupport.h b/Example/Pods/Headers/Private/Expecta/ExpectaSupport.h
diff --git a/Example/Pods/Headers/Private/Expecta/NSObject+Expecta.h b/Example/Pods/Headers/Private/Expecta/NSObject+Expecta.h
diff --git a/Example/Pods/Headers/Private/Expecta/NSValue+Expecta.h b/Example/Pods/Headers/Private/Expecta/NSValue+Expecta.h
diff --git a/Example/Pods/Headers/Private/Nimble/DSL.h b/Example/Pods/Headers/Private/Nimble/DSL.h
diff --git a/Example/Pods/Headers/Private/Nimble/NMBExceptionCapture.h b/Example/Pods/Headers/Private/Nimble/NMBExceptionCapture.h
diff --git a/Example/Pods/Headers/Private/Nimble/Nimble.h b/Example/Pods/Headers/Private/Nimble/Nimble.h
diff --git a/Example/Pods/Headers/Private/OCMock/NSInvocation+OCMAdditions.h b/Example/Pods/Headers/Private/OCMock/NSInvocation+OCMAdditions.h
diff --git a/Example/Pods/Headers/Private/OCMock/NSMethodSignature+OCMAdditions.h b/Example/Pods/Headers/Private/OCMock/NSMethodSignature+OCMAdditions.h
diff --git a/Example/Pods/Headers/Private/OCMock/NSNotificationCenter+OCMAdditions.h b/Example/Pods/Headers/Private/OCMock/NSNotificationCenter+OCMAdditions.h
diff --git a/Example/Pods/Headers/Private/OCMock/NSObject+OCMAdditions.h b/Example/Pods/Headers/Private/OCMock/NSObject+OCMAdditions.h
diff --git a/Example/Pods/Headers/Private/OCMock/NSValue+OCMAdditions.h b/Example/Pods/Headers/Private/OCMock/NSValue+OCMAdditions.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCClassMockObject.h b/Example/Pods/Headers/Private/OCMock/OCClassMockObject.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMArg.h b/Example/Pods/Headers/Private/OCMock/OCMArg.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMArgAction.h b/Example/Pods/Headers/Private/OCMock/OCMArgAction.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMBlockArgCaller.h b/Example/Pods/Headers/Private/OCMock/OCMBlockArgCaller.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMBlockCaller.h b/Example/Pods/Headers/Private/OCMock/OCMBlockCaller.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMBoxedReturnValueProvider.h b/Example/Pods/Headers/Private/OCMock/OCMBoxedReturnValueProvider.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMConstraint.h b/Example/Pods/Headers/Private/OCMock/OCMConstraint.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMExceptionReturnValueProvider.h b/Example/Pods/Headers/Private/OCMock/OCMExceptionReturnValueProvider.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMExpectationRecorder.h b/Example/Pods/Headers/Private/OCMock/OCMExpectationRecorder.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMFunctions.h b/Example/Pods/Headers/Private/OCMock/OCMFunctions.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMFunctionsPrivate.h b/Example/Pods/Headers/Private/OCMock/OCMFunctionsPrivate.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMIndirectReturnValueProvider.h b/Example/Pods/Headers/Private/OCMock/OCMIndirectReturnValueProvider.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMInvocationExpectation.h b/Example/Pods/Headers/Private/OCMock/OCMInvocationExpectation.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMInvocationMatcher.h b/Example/Pods/Headers/Private/OCMock/OCMInvocationMatcher.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMInvocationStub.h b/Example/Pods/Headers/Private/OCMock/OCMInvocationStub.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMLocation.h b/Example/Pods/Headers/Private/OCMock/OCMLocation.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMMacroState.h b/Example/Pods/Headers/Private/OCMock/OCMMacroState.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMNotificationPoster.h b/Example/Pods/Headers/Private/OCMock/OCMNotificationPoster.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMObserverRecorder.h b/Example/Pods/Headers/Private/OCMock/OCMObserverRecorder.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMPassByRefSetter.h b/Example/Pods/Headers/Private/OCMock/OCMPassByRefSetter.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMRealObjectForwarder.h b/Example/Pods/Headers/Private/OCMock/OCMRealObjectForwarder.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMRecorder.h b/Example/Pods/Headers/Private/OCMock/OCMRecorder.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMReturnValueProvider.h b/Example/Pods/Headers/Private/OCMock/OCMReturnValueProvider.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMStubRecorder.h b/Example/Pods/Headers/Private/OCMock/OCMStubRecorder.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMVerifier.h b/Example/Pods/Headers/Private/OCMock/OCMVerifier.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMock.h b/Example/Pods/Headers/Private/OCMock/OCMock.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCMockObject.h b/Example/Pods/Headers/Private/OCMock/OCMockObject.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCObserverMockObject.h b/Example/Pods/Headers/Private/OCMock/OCObserverMockObject.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCPartialMockObject.h b/Example/Pods/Headers/Private/OCMock/OCPartialMockObject.h
diff --git a/Example/Pods/Headers/Private/OCMock/OCProtocolMockObject.h b/Example/Pods/Headers/Private/OCMock/OCProtocolMockObject.h
diff --git a/Example/Pods/Headers/Private/Quick/NSString+QCKSelectorName.h b/Example/Pods/Headers/Private/Quick/NSString+QCKSelectorName.h
diff --git a/Example/Pods/Headers/Private/Quick/QCKDSL.h b/Example/Pods/Headers/Private/Quick/QCKDSL.h
diff --git a/Example/Pods/Headers/Private/Quick/Quick.h b/Example/Pods/Headers/Private/Quick/Quick.h
diff --git a/Example/Pods/Headers/Private/Quick/QuickConfiguration.h b/Example/Pods/Headers/Private/Quick/QuickConfiguration.h
diff --git a/Example/Pods/Headers/Private/Quick/QuickSpec.h b/Example/Pods/Headers/Private/Quick/QuickSpec.h
diff --git a/Example/Pods/Headers/Private/Quick/World+DSL.h b/Example/Pods/Headers/Private/Quick/World+DSL.h
diff --git a/Example/Pods/Headers/Private/Quick/World.h b/Example/Pods/Headers/Private/Quick/World.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTCallSite.h b/Example/Pods/Headers/Private/Specta/SPTCallSite.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTCompiledExample.h b/Example/Pods/Headers/Private/Specta/SPTCompiledExample.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTExample.h b/Example/Pods/Headers/Private/Specta/SPTExample.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTExampleGroup.h b/Example/Pods/Headers/Private/Specta/SPTExampleGroup.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTExcludeGlobalBeforeAfterEach.h b/Example/Pods/Headers/Private/Specta/SPTExcludeGlobalBeforeAfterEach.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTGlobalBeforeAfterEach.h b/Example/Pods/Headers/Private/Specta/SPTGlobalBeforeAfterEach.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTSharedExampleGroups.h b/Example/Pods/Headers/Private/Specta/SPTSharedExampleGroups.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTSpec.h b/Example/Pods/Headers/Private/Specta/SPTSpec.h
diff --git a/Example/Pods/Headers/Private/Specta/SPTTestSuite.h b/Example/Pods/Headers/Private/Specta/SPTTestSuite.h
diff --git a/Example/Pods/Headers/Private/Specta/Specta.h b/Example/Pods/Headers/Private/Specta/Specta.h
diff --git a/Example/Pods/Headers/Private/Specta/SpectaDSL.h b/Example/Pods/Headers/Private/Specta/SpectaDSL.h
diff --git a/Example/Pods/Headers/Private/Specta/SpectaTypes.h b/Example/Pods/Headers/Private/Specta/SpectaTypes.h
diff --git a/Example/Pods/Headers/Private/Specta/SpectaUtility.h b/Example/Pods/Headers/Private/Specta/SpectaUtility.h
diff --git a/Example/Pods/Headers/Private/Specta/XCTest+Private.h b/Example/Pods/Headers/Private/Specta/XCTest+Private.h
diff --git a/Example/Pods/Headers/Private/Specta/XCTestCase+Specta.h b/Example/Pods/Headers/Private/Specta/XCTestCase+Specta.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWStringParser.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWStringParser.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWStringParserTag.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWStringParserTag.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedString-umbrella.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedString-umbrella.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedString.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedString.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedStringAttribute.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedStringAttribute.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedStringOptions.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedStringOptions.h
diff --git a/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedString_Private.h b/Example/Pods/Headers/Private/ZSWTaggedString/ZSWTaggedString_Private.h
diff --git a/Example/Pods/Local Podspecs/ZSWTaggedString.podspec.json b/Example/Pods/Local Podspecs/ZSWTaggedString.podspec.json