Merge branch 'xcode6' into swift-development

Conflicts: .gitmodules External/Quick ReactiveCocoa.xcodeproj/project.pbxproj ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa Mac.xcscheme ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa iOS.xcscheme ReactiveCocoa.xcworkspace/contents.xcworkspacedata ReactiveCocoa/EXTKeyPathCoding.h ReactiveCocoa/EXTRuntimeExtensions.h ReactiveCocoa/EXTRuntimeExtensions.m ReactiveCocoa/EXTScope.h ReactiveCocoa/Info.plist ReactiveCocoa/ReactiveCocoa.h ReactiveCocoa/extobjc/EXTKeyPathCoding.h ReactiveCocoa/extobjc/EXTRuntimeExtensions.h ReactiveCocoa/extobjc/EXTRuntimeExtensions.m ReactiveCocoa/extobjc/EXTScope.h ReactiveCocoa/extobjc/metamacros.h ReactiveCocoa/metamacros.h ReactiveCocoaFramework/ReactiveCocoa/extobjc/EXTKeyPathCoding.h ReactiveCocoaFramework/ReactiveCocoa/extobjc/EXTRuntimeExtensions.h ReactiveCocoaFramework/ReactiveCocoa/extobjc/EXTRuntimeExtensions.m ReactiveCocoaFramework/ReactiveCocoa/extobjc/EXTScope.h ReactiveCocoaFramework/ReactiveCocoa/extobjc/metamacros.h ReactiveCocoaTests/Info.plist ReactiveCocoaTests/NSControllerRACSupportSpec.m ReactiveCocoaTests/NSEnumeratorRACSequenceAdditionsSpec.m ReactiveCocoaTests/NSNotificationCenterRACSupportSpec.m ReactiveCocoaTests/NSObjectRACAppKitBindingsSpec.m ReactiveCocoaTests/NSObjectRACDeallocatingSpec.m ReactiveCocoaTests/NSObjectRACLiftingSpec.m ReactiveCocoaTests/NSObjectRACPropertySubscribingExamples.h ReactiveCocoaTests/NSObjectRACPropertySubscribingExamples.m ReactiveCocoaTests/NSObjectRACPropertySubscribingSpec.m ReactiveCocoaTests/NSObjectRACSelectorSignalSpec.m ReactiveCocoaTests/NSURLConnectionRACSupportSpec.m ReactiveCocoaTests/NSUserDefaultsRACSupportSpec.m ReactiveCocoaTests/RACBacktraceSpec.m ReactiveCocoaTests/RACBlockTrampolineSpec.m ReactiveCocoaTests/RACChannelExamples.h ReactiveCocoaTests/RACChannelExamples.m ReactiveCocoaTests/RACChannelSpec.m ReactiveCocoaTests/RACCommandSpec.m ReactiveCocoaTests/RACCompoundDisposableSpec.m ReactiveCocoaTests/RACControlCommandExamples.h ReactiveCocoaTests/RACControlCommandExamples.m ReactiveCocoaTests/RACDelegateProxySpec.m ReactiveCocoaTests/RACDisposableSpec.m ReactiveCocoaTests/RACKVOChannelSpec.m ReactiveCocoaTests/RACKVOWrapperSpec.m ReactiveCocoaTests/RACMulticastConnectionSpec.m ReactiveCocoaTests/RACPropertySignalExamples.h ReactiveCocoaTests/RACPropertySignalExamples.m ReactiveCocoaTests/RACSchedulerSpec.m ReactiveCocoaTests/RACSequenceAdditionsSpec.m ReactiveCocoaTests/RACSequenceExamples.h ReactiveCocoaTests/RACSequenceExamples.m ReactiveCocoaTests/RACSequenceSpec.m ReactiveCocoaTests/RACSerialDisposableSpec.m ReactiveCocoaTests/RACSignalSpec.m ReactiveCocoaTests/RACStreamExamples.h ReactiveCocoaTests/RACStreamExamples.m ReactiveCocoaTests/RACSubclassObject.h ReactiveCocoaTests/RACSubclassObject.m ReactiveCocoaTests/RACSubjectSpec.m ReactiveCocoaTests/RACSubscriberExamples.h ReactiveCocoaTests/RACSubscriberExamples.m ReactiveCocoaTests/RACSubscriberSpec.m ReactiveCocoaTests/RACSubscriptingAssignmentTrampolineSpec.m ReactiveCocoaTests/RACTargetQueueSchedulerSpec.m ReactiveCocoaTests/RACTestExampleScheduler.h ReactiveCocoaTests/RACTestExampleScheduler.m ReactiveCocoaTests/RACTestObject.h ReactiveCocoaTests/RACTestObject.m ReactiveCocoaTests/RACTestSchedulerSpec.m ReactiveCocoaTests/RACTestUIButton.h ReactiveCocoaTests/RACTestUIButton.m ReactiveCocoaTests/UIActionSheetRACSupportSpec.m ReactiveCocoaTests/UIAlertViewRACSupportSpec.m ReactiveCocoaTests/UIBarButtonItemRACSupportSpec.m ReactiveCocoaTests/UIButtonRACSupportSpec.m ReactiveCocoaTests/UIImagePickerControllerRACSupportSpec.m ReactiveCocoaTests/test-data.json
il3n · Oct 15, 2014 · ef019ac · ef019ac
2 parents 4806468 + 51a7217
commit ef019ac
Show file tree

Hide file tree

Showing 81 changed files with 14,559 additions and 1,938 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/jspahrsummers/xcconfigs.git
 [submodule "External/Quick"]
 	path = External/Quick
-	url = https://github.com/Quick/Quick.git
+	url = https://github.com/github/Quick.git
 [submodule "External/LlamaKit"]
 	path = External/LlamaKit
 	url = https://github.com/ReactiveCocoa/LlamaKit.git
diff --git a/External/Quick b/External/Quick
diff --git a/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoa.xcodeproj/project.pbxproj
diff --git a/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa Mac.xcscheme b/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa Mac.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0610"
-   version = "2.0">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,12 +14,26 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D047967219666BF30066B267"
+               BlueprintIdentifier = "D04725E919E49ED7006002AA"
                BuildableName = "ReactiveCocoa.framework"
                BlueprintName = "ReactiveCocoa-Mac"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D04725F419E49ED7006002AA"
+               BuildableName = "ReactiveCocoa-MacTests.xctest"
+               BlueprintName = "ReactiveCocoa-MacTests"
+               ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -32,28 +46,36 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D047967D19666BF30066B267"
+               BlueprintIdentifier = "D04725F419E49ED7006002AA"
                BuildableName = "ReactiveCocoa-MacTests.xctest"
                BlueprintName = "ReactiveCocoa-MacTests"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D04725E919E49ED7006002AA"
+            BuildableName = "ReactiveCocoa.framework"
+            BlueprintName = "ReactiveCocoa-Mac"
+            ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugXPCServices = "NO"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D047967219666BF30066B267"
+            BlueprintIdentifier = "D04725E919E49ED7006002AA"
             BuildableName = "ReactiveCocoa.framework"
             BlueprintName = "ReactiveCocoa-Mac"
             ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
@@ -68,6 +90,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Profile"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D04725E919E49ED7006002AA"
+            BuildableName = "ReactiveCocoa.framework"
+            BlueprintName = "ReactiveCocoa-Mac"
+            ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa iOS.xcscheme b/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa iOS.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0610"
-   version = "2.0">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,12 +14,26 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D047969919666CBF0066B267"
+               BlueprintIdentifier = "D047260B19E49F82006002AA"
                BuildableName = "ReactiveCocoa.framework"
                BlueprintName = "ReactiveCocoa-iOS"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D047261519E49F82006002AA"
+               BuildableName = "ReactiveCocoa-iOSTests.xctest"
+               BlueprintName = "ReactiveCocoa-iOSTests"
+               ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -32,28 +46,36 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D04796A319666CBF0066B267"
+               BlueprintIdentifier = "D047261519E49F82006002AA"
                BuildableName = "ReactiveCocoa-iOSTests.xctest"
                BlueprintName = "ReactiveCocoa-iOSTests"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D047260B19E49F82006002AA"
+            BuildableName = "ReactiveCocoa.framework"
+            BlueprintName = "ReactiveCocoa-iOS"
+            ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugXPCServices = "NO"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D047969919666CBF0066B267"
+            BlueprintIdentifier = "D047260B19E49F82006002AA"
             BuildableName = "ReactiveCocoa.framework"
             BlueprintName = "ReactiveCocoa-iOS"
             ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
@@ -68,6 +90,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Profile"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D047260B19E49F82006002AA"
+            BuildableName = "ReactiveCocoa.framework"
+            BlueprintName = "ReactiveCocoa-iOS"
+            ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/ReactiveCocoa/Info.plist b/ReactiveCocoa/Info.plist
@@ -5,21 +5,23 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.github.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.github.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>${CURRENT_PROJECT_VERSION}</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2014 GitHub. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/ReactiveCocoa/NSObject+RACLifting.h b/ReactiveCocoa/NSObject+RACLifting.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 @class RACSignal;
 
 @interface NSObject (RACLifting)

diff --git a/ReactiveCocoa/RACCommand.m b/ReactiveCocoa/RACCommand.m
@@ -189,7 +189,7 @@ - (id)initWithEnabled:(RACSignal *)enabledSignal signalBlock:(RACSignal * (^)(id
 	RACSignal *moreExecutionsAllowed = [RACSignal
 		if:RACObserve(self, allowsConcurrentExecution)
 		then:[RACSignal return:@YES]
-		else:[immediateExecuting notEach]];
+		else:[immediateExecuting not]];
 
 	if (enabledSignal == nil) {
 		enabledSignal = [RACSignal return:@YES];
@@ -202,7 +202,7 @@ - (id)initWithEnabled:(RACSignal *)enabledSignal signalBlock:(RACSignal * (^)(id
 
 	_immediateEnabled = [[RACSignal
 		combineLatest:@[ enabledSignal, moreExecutionsAllowed ]]
-		reduceAnd];
+		and];
 
 	_enabled = [[[[[self.immediateEnabled
 		take:1]

diff --git a/ReactiveCocoa/RACSignal+Operations.h b/ReactiveCocoa/RACSignal+Operations.h
@@ -637,21 +637,21 @@ extern const NSInteger RACSignalErrorNoMatchingCase;
 /// the receiver sends anything other than NSNumbers.
 ///
 /// Returns a signal of inverted NSNumber-wrapped BOOLs.
-- (RACSignal *)notEach;
+- (RACSignal *)not;
 
 /// Performs a boolean AND on all of the RACTuple of NSNumbers in sent by the receiver.
 ///
 /// Asserts if the receiver sends anything other than a RACTuple of one or more NSNumbers.
 ///
 /// Returns a signal that applies AND to each NSNumber in the tuple.
-- (RACSignal *)reduceAnd;
+- (RACSignal *)and;
 
 /// Performs a boolean OR on all of the RACTuple of NSNumbers in sent by the receiver.
 ///
 /// Asserts if the receiver sends anything other than a RACTuple of one or more NSNumbers.
 /// 
 /// Returns a signal that applies OR to each NSNumber in the tuple.
-- (RACSignal *)reduceOr;
+- (RACSignal *)or;
 
 /// Sends the result of calling the block with arguments as packed in each RACTuple
 /// sent by the receiver.

diff --git a/ReactiveCocoa/RACSignal+Operations.m b/ReactiveCocoa/RACSignal+Operations.m
@@ -1232,38 +1232,38 @@ - (RACSignal *)dematerialize {
 	}] setNameWithFormat:@"[%@] -dematerialize", self.name];
 }
 
-- (RACSignal *)notEach {
+- (RACSignal *)not {
 	return [[self map:^(NSNumber *value) {
-		NSCAssert([value isKindOfClass:NSNumber.class], @"-notEach must only be used on a signal of NSNumbers. Instead, got: %@", value);
+		NSCAssert([value isKindOfClass:NSNumber.class], @"-not must only be used on a signal of NSNumbers. Instead, got: %@", value);
 
 		return @(!value.boolValue);
-	}] setNameWithFormat:@"[%@] -notEach", self.name];
+	}] setNameWithFormat:@"[%@] -not", self.name];
 }
 
-- (RACSignal *)reduceAnd {
+- (RACSignal *)and {
 	return [[self map:^(RACTuple *tuple) {
-		NSCAssert([tuple isKindOfClass:RACTuple.class], @"-reduceAnd must only be used on a signal of RACTuples of NSNumbers. Instead, received: %@", tuple);
-		NSCAssert(tuple.count > 0, @"-reduceAnd must only be used on a signal of RACTuples of NSNumbers, with at least 1 value in the tuple");
+		NSCAssert([tuple isKindOfClass:RACTuple.class], @"-and must only be used on a signal of RACTuples of NSNumbers. Instead, received: %@", tuple);
+		NSCAssert(tuple.count > 0, @"-and must only be used on a signal of RACTuples of NSNumbers, with at least 1 value in the tuple");
 
 		return @([tuple.rac_sequence all:^(NSNumber *number) {
-			NSCAssert([number isKindOfClass:NSNumber.class], @"-reduceAnd must only be used on a signal of RACTuples of NSNumbers. Instead, tuple contains a non-NSNumber value: %@", tuple);
+			NSCAssert([number isKindOfClass:NSNumber.class], @"-and must only be used on a signal of RACTuples of NSNumbers. Instead, tuple contains a non-NSNumber value: %@", tuple);
 
 			return number.boolValue;
 		}]);
-	}] setNameWithFormat:@"[%@] -reduceAnd", self.name];
+	}] setNameWithFormat:@"[%@] -and", self.name];
 }
 
-- (RACSignal *)reduceOr {
+- (RACSignal *)or {
 	return [[self map:^(RACTuple *tuple) {
-		NSCAssert([tuple isKindOfClass:RACTuple.class], @"-reduceOr must only be used on a signal of RACTuples of NSNumbers. Instead, received: %@", tuple);
-		NSCAssert(tuple.count > 0, @"-reduceOr must only be used on a signal of RACTuples of NSNumbers, with at least 1 value in the tuple");
+		NSCAssert([tuple isKindOfClass:RACTuple.class], @"-or must only be used on a signal of RACTuples of NSNumbers. Instead, received: %@", tuple);
+		NSCAssert(tuple.count > 0, @"-or must only be used on a signal of RACTuples of NSNumbers, with at least 1 value in the tuple");
 
 		return @([tuple.rac_sequence any:^(NSNumber *number) {
-			NSCAssert([number isKindOfClass:NSNumber.class], @"-reduceOr must only be used on a signal of RACTuples of NSNumbers. Instead, tuple contains a non-NSNumber value: %@", tuple);
+			NSCAssert([number isKindOfClass:NSNumber.class], @"-or must only be used on a signal of RACTuples of NSNumbers. Instead, tuple contains a non-NSNumber value: %@", tuple);
 
 			return number.boolValue;
 		}]);
-	}] setNameWithFormat:@"[%@] -reduceOr", self.name];
+	}] setNameWithFormat:@"[%@] -or", self.name];
 }
 
 - (RACSignal *)reduceApply {

diff --git a/ReactiveCocoa/ReactiveCocoa.h b/ReactiveCocoa/ReactiveCocoa.h
@@ -2,8 +2,8 @@
 //  ReactiveCocoa.h
 //  ReactiveCocoa
 //
-//  Created by Justin Spahr-Summers on 2014-07-03.
-//  Copyright (c) 2014 GitHub. All rights reserved.
+//  Created by Josh Abernathy on 3/5/12.
+//  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -15,6 +15,7 @@ FOUNDATION_EXPORT double ReactiveCocoaVersionNumber;
 FOUNDATION_EXPORT const unsigned char ReactiveCocoaVersionString[];
 
 #import <ReactiveCocoa/EXTKeyPathCoding.h>
+#import <ReactiveCocoa/EXTScope.h>
 #import <ReactiveCocoa/NSArray+RACSequenceAdditions.h>
 #import <ReactiveCocoa/NSData+RACSupport.h>
 #import <ReactiveCocoa/NSDictionary+RACSequenceAdditions.h>
@@ -32,6 +33,7 @@ FOUNDATION_EXPORT const unsigned char ReactiveCocoaVersionString[];
 #import <ReactiveCocoa/NSIndexSet+RACSequenceAdditions.h>
 #import <ReactiveCocoa/NSURLConnection+RACSupport.h>
 #import <ReactiveCocoa/NSUserDefaults+RACSupport.h>
+#import <ReactiveCocoa/RACBacktrace.h>
 #import <ReactiveCocoa/RACBehaviorSubject.h>
 #import <ReactiveCocoa/RACChannel.h>
 #import <ReactiveCocoa/RACCommand.h>
@@ -42,8 +44,10 @@ FOUNDATION_EXPORT const unsigned char ReactiveCocoaVersionString[];
 #import <ReactiveCocoa/RACKVOChannel.h>
 #import <ReactiveCocoa/RACMulticastConnection.h>
 #import <ReactiveCocoa/RACQueueScheduler.h>
+#import <ReactiveCocoa/RACQueueScheduler+Subclass.h>
 #import <ReactiveCocoa/RACReplaySubject.h>
 #import <ReactiveCocoa/RACScheduler.h>
+#import <ReactiveCocoa/RACScheduler+Subclass.h>
 #import <ReactiveCocoa/RACScopedDisposable.h>
 #import <ReactiveCocoa/RACSequence.h>
 #import <ReactiveCocoa/RACSerialDisposable.h>
@@ -74,6 +78,7 @@ FOUNDATION_EXPORT const unsigned char ReactiveCocoaVersionString[];
 	#import <ReactiveCocoa/UIStepper+RACSignalSupport.h>
 	#import <ReactiveCocoa/UISwitch+RACSignalSupport.h>
 	#import <ReactiveCocoa/UITableViewCell+RACSignalSupport.h>
+	#import <ReactiveCocoa/UITableViewHeaderFooterView+RACSignalSupport.h>
 	#import <ReactiveCocoa/UITextField+RACSignalSupport.h>
 	#import <ReactiveCocoa/UITextView+RACSignalSupport.h>
 #elif TARGET_OS_MAC

diff --git a/ReactiveCocoa/EXTKeyPathCoding.h → ReactiveCocoa/extobjc/EXTKeyPathCoding.h b/ReactiveCocoa/EXTKeyPathCoding.h → ReactiveCocoa/extobjc/EXTKeyPathCoding.h
diff --git a/ReactiveCocoa/EXTRuntimeExtensions.h → ReactiveCocoa/extobjc/EXTRuntimeExtensions.h b/ReactiveCocoa/EXTRuntimeExtensions.h → ReactiveCocoa/extobjc/EXTRuntimeExtensions.h
diff --git a/ReactiveCocoa/EXTRuntimeExtensions.m → ReactiveCocoa/extobjc/EXTRuntimeExtensions.m b/ReactiveCocoa/EXTRuntimeExtensions.m → ReactiveCocoa/extobjc/EXTRuntimeExtensions.m
@@ -8,7 +8,9 @@
 //
 
 #import "EXTRuntimeExtensions.h"
+
 #import <ctype.h>
+#import <Foundation/Foundation.h>
 #import <libkern/OSAtomic.h>
 #import <objc/message.h>
 #import <pthread.h>

diff --git a/ReactiveCocoa/EXTScope.h → ReactiveCocoa/extobjc/EXTScope.h b/ReactiveCocoa/EXTScope.h → ReactiveCocoa/extobjc/EXTScope.h
diff --git a/ReactiveCocoa/metamacros.h → ReactiveCocoa/extobjc/metamacros.h b/ReactiveCocoa/metamacros.h → ReactiveCocoa/extobjc/metamacros.h
+1 −1		.gitmodules
+1 −1		Externals/Nimble
+2 −0		Quick/Quick.xcodeproj/project.pbxproj
+13 −13		Quick/Quick/QCKDSL.h