Merge pull request #611 from kiwi-bdd/frameworks

Dynamic frameworks and Carthage support

.travis.yml

@@ -1,5 +1,6 @@
 language: objective-c
 before_install:
   - gem install xcpretty # this will go away soon when Travis installs xcpretty
+  - gem install cocoapods # latest version of cocoapods
 script: make ci
 

Classes/Core/KWMessagePattern.m

@@ -5,14 +5,14 @@
 //
 
 #import "KWMessagePattern.h"
+#import "KWAny.h"
 #import "KWFormatter.h"
 #import "KWNull.h"
 #import "KWObjCUtilities.h"
 #import "KWValue.h"
 #import "NSInvocation+KiwiAdditions.h"
 #import "NSMethodSignature+KiwiAdditions.h"
 #import "KWGenericMatchEvaluator.h"
-#import "Kiwi.h"
 
 @implementation KWMessagePattern
 

Classes/Core/Kiwi.h

@@ -4,100 +4,111 @@
 // Copyright 2010 Allen Ding. All rights reserved.
 //
 
-// This needs to come first.
-#import "KiwiConfiguration.h"
+#import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
+//! Project version number for Kiwi.
+FOUNDATION_EXPORT double KiwiVersionNumber;
+
+//! Project version string for Kiwi.
+FOUNDATION_EXPORT const unsigned char KiwiVersionString[];
+
+// This needs to come first.
+#import <Kiwi/KiwiConfiguration.h>
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-#import "KWAfterAllNode.h"
-#import "KWAfterEachNode.h"
-#import "KWAny.h"
-#import "KWAsyncVerifier.h"
-#import "KWBeBetweenMatcher.h"
-#import "KWBeEmptyMatcher.h"
-#import "KWBeIdenticalToMatcher.h"
-#import "KWBeKindOfClassMatcher.h"
-#import "KWBeMemberOfClassMatcher.h"
-#import "KWBeSubclassOfClassMatcher.h"
-#import "KWBeTrueMatcher.h"
-#import "KWNilMatcher.h"
-#import "KWBeWithinMatcher.h"
-#import "KWBeZeroMatcher.h"
-#import "KWBeforeAllNode.h"
-#import "KWBeforeEachNode.h"
-#import "KWBlock.h"
-#import "KWBlockNode.h"
-#import "KWBlockRaiseMatcher.h"
-#import "KWCallSite.h"
-#import "KWChangeMatcher.h"
-#import "KWConformToProtocolMatcher.h"
-#import "KWContainMatcher.h"
-#import "KWContainStringMatcher.h"
-#import "KWContextNode.h"
-#import "KWDeviceInfo.h"
-#import "KWEqualMatcher.h"
-#import "KWExample.h"
-#import "KWExampleSuiteBuilder.h"
-#import "KWExampleNode.h"
-#import "KWExampleNodeVisitor.h"
-#import "KWSharedExample.h"
-#import "KWExistVerifier.h"
-#import "KWExpectationType.h"
-#import "KWFailure.h"
-#import "KWFormatter.h"
-#import "KWFutureObject.h"
-#import "KWGenericMatcher.h"
-#import "KWHaveMatcher.h"
-#import "KWHaveValueMatcher.h"
-#import "KWInequalityMatcher.h"
-#import "KWInvocationCapturer.h"
-#import "KWItNode.h"
-#import "KWMatchVerifier.h"
-#import "KWMatcher.h"
-#import "KWMatchers.h"
-#import "KWMatcherFactory.h"
-#import "KWMatching.h"
-#import "KWMessagePattern.h"
-#import "KWMessageSpying.h"
-#import "KWMock.h"
-#import "KWNull.h"
-#import "KWObjCUtilities.h"
-#import "KWPendingNode.h"
-#import "KWReceiveMatcher.h"
-#import "KWRegisterMatchersNode.h"
-#import "KWRegularExpressionPatternMatcher.h"
-#import "KWRespondToSelectorMatcher.h"
-#import "KWSpec.h"
-#import "KWStringUtilities.h"
-#import "KWStub.h"
-#import "KWSuiteConfigurationBase.h"
-#import "KWUserDefinedMatcher.h"
-#import "KWValue.h"
-#import "KWVerifying.h"
-#import "KWCaptureSpy.h"
-#import "KWStringPrefixMatcher.h"
-#import "KWStringContainsMatcher.h"
-#import "KWNotificationMatcher.h"
+#import <Kiwi/KWAfterAllNode.h>
+#import <Kiwi/KWAfterEachNode.h>
+#import <Kiwi/KWAny.h>
+#import <Kiwi/KWAsyncVerifier.h>
+#import <Kiwi/KWBeBetweenMatcher.h>
+#import <Kiwi/KWBeEmptyMatcher.h>
+#import <Kiwi/KWBeIdenticalToMatcher.h>
+#import <Kiwi/KWBeKindOfClassMatcher.h>
+#import <Kiwi/KWBeMemberOfClassMatcher.h>
+#import <Kiwi/KWBeSubclassOfClassMatcher.h>
+#import <Kiwi/KWBeTrueMatcher.h>
+#import <Kiwi/KWBeWithinMatcher.h>
+#import <Kiwi/KWBeZeroMatcher.h>
+#import <Kiwi/KWBeforeAllNode.h>
+#import <Kiwi/KWBeforeEachNode.h>
+#import <Kiwi/KWBlock.h>
+#import <Kiwi/KWBlockNode.h>
+#import <Kiwi/KWBlockRaiseMatcher.h>
+#import <Kiwi/KWCallSite.h>
+#import <Kiwi/KWCaptureSpy.h>
+#import <Kiwi/KWChangeMatcher.h>
+#import <Kiwi/KWConformToProtocolMatcher.h>
+#import <Kiwi/KWContainMatcher.h>
+#import <Kiwi/KWContainStringMatcher.h>
+#import <Kiwi/KWContextNode.h>
+#import <Kiwi/KWCountType.h>
+#import <Kiwi/KWDeviceInfo.h>
+#import <Kiwi/KWEqualMatcher.h>
+#import <Kiwi/KWExample.h>
+#import <Kiwi/KWExampleDelegate.h>
+#import <Kiwi/KWExampleNode.h>
+#import <Kiwi/KWExampleNodeVisitor.h>
+#import <Kiwi/KWExampleSuiteBuilder.h>
+#import <Kiwi/KWExistVerifier.h>
+#import <Kiwi/KWExpectationType.h>
+#import <Kiwi/KWFailure.h>
+#import <Kiwi/KWFormatter.h>
+#import <Kiwi/KWFutureObject.h>
+#import <Kiwi/KWGenericMatcher.h>
+#import <Kiwi/KWHaveMatcher.h>
+#import <Kiwi/KWHaveValueMatcher.h>
+#import <Kiwi/KWInequalityMatcher.h>
+#import <Kiwi/KWInvocationCapturer.h>
+#import <Kiwi/KWItNode.h>
+#import <Kiwi/KWLet.h>
+#import <Kiwi/KWMatchVerifier.h>
+#import <Kiwi/KWMatcher.h>
+#import <Kiwi/KWMatcherFactory.h>
+#import <Kiwi/KWMatchers.h>
+#import <Kiwi/KWMatching.h>
+#import <Kiwi/KWMessagePattern.h>
+#import <Kiwi/KWMessageSpying.h>
+#import <Kiwi/KWMock.h>
+#import <Kiwi/KWNilMatcher.h>
+#import <Kiwi/KWNotificationMatcher.h>
+#import <Kiwi/KWNull.h>
+#import <Kiwi/KWObjCUtilities.h>
+#import <Kiwi/KWPendingNode.h>
+#import <Kiwi/KWProbe.h>
+#import <Kiwi/KWReceiveMatcher.h>
+#import <Kiwi/KWRegisterMatchersNode.h>
+#import <Kiwi/KWRegularExpressionPatternMatcher.h>
+#import <Kiwi/KWReporting.h>
+#import <Kiwi/KWRespondToSelectorMatcher.h>
+#import <Kiwi/KWSharedExample.h>
+#import <Kiwi/KWSpec.h>
+#import <Kiwi/KWStringContainsMatcher.h>
+#import <Kiwi/KWStringPrefixMatcher.h>
+#import <Kiwi/KWStringUtilities.h>
+#import <Kiwi/KWStub.h>
+#import <Kiwi/KWSuiteConfigurationBase.h>
+#import <Kiwi/KWUserDefinedMatcher.h>
+#import <Kiwi/KWValue.h>
+#import <Kiwi/KWVerifying.h>
 
-
 // Public Foundation Categories
-#import "NSObject+KiwiMockAdditions.h"
-#import "NSObject+KiwiSpyAdditions.h"
-#import "NSObject+KiwiStubAdditions.h"
-#import "NSObject+KiwiVerifierAdditions.h"
-#import "NSProxy+KiwiVerifierAdditions.h"
+#import <Kiwi/NSObject+KiwiMockAdditions.h>
+#import <Kiwi/NSObject+KiwiSpyAdditions.h>
+#import <Kiwi/NSObject+KiwiStubAdditions.h>
+#import <Kiwi/NSObject+KiwiVerifierAdditions.h>
+#import <Kiwi/NSProxy+KiwiVerifierAdditions.h>
 
-#import "KiwiMacros.h"
+#import <Kiwi/KiwiMacros.h>
 
 // Some Foundation headers use Kiwi keywords (e.g. 'should') as identifiers for
 // parameter names. Including this last allows the use of Kiwi keywords without
 // conflicting with these headers (hopefully!).
-#import "KiwiBlockMacros.h"
+#import <Kiwi/KiwiBlockMacros.h>
 
 #if defined(__cplusplus)
 }
 #endif
-

Classes/Core/KiwiConfiguration.h

@@ -4,6 +4,8 @@
 // Copyright 2010 Allen Ding. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 // As of iPhone SDK 4 GM, exceptions thrown across an NSInvocation -invoke or
 // forwardInvocation: boundary in the simulator will terminate the app instead
 // of being caught in @catch blocks from the caller side of the -invoke. Kiwi

Classes/Matchers/KWHaveMatcher.h

@@ -5,7 +5,6 @@
 //
 
 #import "KiwiConfiguration.h"
-#import "KWCountType.h"
 #import "KWMatcher.h"
 #import "KWMatchVerifier.h"
 

Classes/Matchers/KWHaveMatcher.m

@@ -5,6 +5,7 @@
 //
 
 #import "KWHaveMatcher.h"
+#import "KWCountType.h"
 #import "KWFormatter.h"
 #import "KWInvocationCapturer.h"
 #import "KWObjCUtilities.h"

Classes/Verifiers/KWAsyncVerifier.h

@@ -14,7 +14,6 @@
 
 @class KWAsyncMatcherProbe;
 
-
 @interface KWAsyncVerifier : KWMatchVerifier
 
 @property (nonatomic, assign) NSTimeInterval timeout;

Kiwi.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
     'Adam Sharp'   => '[email protected]',
   }
 
-  s.ios.deployment_target = '5.0'
+  s.ios.deployment_target = '5.1.1'
   s.osx.deployment_target = '10.7'
 
   s.framework = 'XCTest'