Skip to content

Commit

Permalink
++Quick to latest master
Browse files Browse the repository at this point in the history
  • Loading branch information
@jspahrsummers
jspahrsummers committed Aug 4, 2014
1 parent 75eeabf commit bf931f6
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "External/Quick"]
path = External/Quick
url = https://github.com/modocache/Quick.git
url = https://github.com/Quick/Quick.git
[submodule "External/swiftz"]
path = External/swiftz
url = https://github.com/maxpow4h/swiftz.git
2 changes: 1 addition & 1 deletion External/Quick
Submodule Quick updated 78 files
+3 −0 .gitmodules
+1 −1 CONTRIBUTING.md
+68 −68 Examples/Scenester/Scenester.xcodeproj/project.pbxproj
+1 −1 Examples/Scenester/Scenester/AppDelegate.swift
+3 −3 Examples/Scenester/Scenester/Commit+Error.swift
+4 −4 Examples/Scenester/Scenester/Commit+Network.swift
+5 −5 Examples/Scenester/Scenester/Commit.swift
+3 −3 Examples/Scenester/Scenester/LatestCommitViewController.swift
+3 −3 Examples/Scenester/ScenesterTests/Commit+ErrorSpec.swift
+1 −1 Examples/Scenester/ScenesterTests/Commit+NetworkSpec.swift
+1 −1 Examples/Scenester/ScenesterTests/CommitSpec.swift
+1 −0 Externals/Nimble
+0 −1,113 Nimble/Nimble.xcodeproj/project.pbxproj
+0 −7 Nimble/Nimble.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+0 −69 Nimble/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble.xcscheme
+0 −23 Nimble/Nimble/Actual.swift
+0 −46 Nimble/Nimble/ActualClosure.swift
+0 −74 Nimble/Nimble/AsyncExpectation.swift
+0 −19 Nimble/Nimble/Callsite.swift
+0 −38 Nimble/Nimble/ClosureExpectation.swift
+0 −27 Nimble/Nimble/DSL.swift
+0 −27 Nimble/Nimble/Expectation.swift
+0 −23 Nimble/Nimble/Extensions/NSObject+Flatten.swift
+0 −26 Nimble/Nimble/Info.plist
+0 −46 Nimble/Nimble/Matcher.swift
+0 −51 Nimble/Nimble/Matchers/BeEmpty.swift
+0 −28 Nimble/Nimble/Matchers/BeFalse.swift
+0 −42 Nimble/Nimble/Matchers/BeIdenticalTo.swift
+0 −30 Nimble/Nimble/Matchers/BeNil.swift
+0 −29 Nimble/Nimble/Matchers/BeTrue.swift
+0 −44 Nimble/Nimble/Matchers/Contain.swift
+0 −29 Nimble/Nimble/Matchers/Equal.swift
+0 −9 Nimble/Nimble/Matchers/NMBDSL+BeEmpty.h
+0 −9 Nimble/Nimble/Matchers/NMBDSL+BeFalse.h
+0 −9 Nimble/Nimble/Matchers/NMBDSL+BeNil.h
+0 −9 Nimble/Nimble/Matchers/NMBDSL+BeTrue.h
+0 −15 Nimble/Nimble/Matchers/NMBRaise.h
+0 −24 Nimble/Nimble/Matchers/NMBRaise.m
+0 −27 Nimble/Nimble/Matchers/Numbers/BeGreaterThan.swift
+0 −27 Nimble/Nimble/Matchers/Numbers/BeGreaterThanOrEqualTo.swift
+0 −27 Nimble/Nimble/Matchers/Numbers/BeLessThan.swift
+0 −27 Nimble/Nimble/Matchers/Numbers/BeLessThanOrEqualTo.swift
+0 −40 Nimble/Nimble/Matchers/Numbers/NumberComparisonMatcher.swift
+0 −90 Nimble/Nimble/Matchers/Raise.swift
+0 −21 Nimble/Nimble/NMBDSL.h
+0 −23 Nimble/Nimble/NMBDSL.m
+0 −24 Nimble/Nimble/Nimble.h
+0 −32 Nimble/Nimble/Prediction.swift
+0 −24 Nimble/NimbleTests/Info.plist
+0 −206 Nimble/NimbleTests/Matchers/BeEmptySpec.swift
+0 −74 Nimble/NimbleTests/Matchers/BeFalseSpec.swift
+0 −94 Nimble/NimbleTests/Matchers/BeIdenticalToSpec.swift
+0 −60 Nimble/NimbleTests/Matchers/BeNilSpec.swift
+0 −75 Nimble/NimbleTests/Matchers/BeTrueSpec.swift
+0 −199 Nimble/NimbleTests/Matchers/ContainSpec.swift
+0 −86 Nimble/NimbleTests/Matchers/EqualSpec.swift
+0 −36 Nimble/NimbleTests/Matchers/MatcherSharedExampleGroups.swift
+0 −21 Nimble/NimbleTests/Matchers/NMBRaiseSpecHelper.h
+0 −36 Nimble/NimbleTests/Matchers/NMBRaiseSpecHelper.m
+0 −124 Nimble/NimbleTests/Matchers/Numbers/BeGreaterThanOrEqualToSpec.swift
+0 −124 Nimble/NimbleTests/Matchers/Numbers/BeGreaterThanSpec.swift
+0 −124 Nimble/NimbleTests/Matchers/Numbers/BeLessThanOrEqualToSpec.swift
+0 −122 Nimble/NimbleTests/Matchers/Numbers/BeLessThanSpec.swift
+0 −187 Nimble/NimbleTests/Matchers/RaiseSpec.swift
+0 −68 Nimble/NimbleTests/NimbleSpec.m
+0 −9 Nimble/NimbleTests/NimbleTests-Bridging-Header.h
+1 −1 Quick.xcworkspace/contents.xcworkspacedata
+42 −42 Quick/Quick.xcodeproj/project.pbxproj
+3 −3 Quick/Quick/Callsite.swift
+23 −23 Quick/Quick/DSL.swift
+5 −5 Quick/Quick/Example.swift
+2 −2 Quick/Quick/ExampleGroup.swift
+13 −17 Quick/Quick/QuickSpec.m
+6 −6 Quick/Quick/World.swift
+3 −3 Quick/QuickTests/FunctionalTests+ObjC.m
+15 −15 Quick/QuickTests/FunctionalTests.swift
+118 −126 README.md
+1 −1 Rakefile
54 changes: 42 additions & 12 deletions ReactiveCocoa.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,6 @@
D0479992196671DF0066B267 /* EXTScope.h in Headers */ = {isa = PBXBuildFile; fileRef = D0479989196671DF0066B267 /* EXTScope.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0479993196671DF0066B267 /* metamacros.h in Headers */ = {isa = PBXBuildFile; fileRef = D047998A196671DF0066B267 /* metamacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0479994196671DF0066B267 /* metamacros.h in Headers */ = {isa = PBXBuildFile; fileRef = D047998A196671DF0066B267 /* metamacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
D047999A196673AC0066B267 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0479998196673AC0066B267 /* Nimble.framework */; };
D047999B196673AC0066B267 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0479999196673AC0066B267 /* Quick.framework */; };
D047999C196673B00066B267 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0479998196673AC0066B267 /* Nimble.framework */; };
D047999D196673B00066B267 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0479999196673AC0066B267 /* Quick.framework */; };
D047999F196678F20066B267 /* ObjectiveCBridgingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D047999E196678F20066B267 /* ObjectiveCBridgingSpec.swift */; };
D04799A0196678F20066B267 /* ObjectiveCBridgingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D047999E196678F20066B267 /* ObjectiveCBridgingSpec.swift */; };
D095745519733BAD002D44C1 /* swiftz_core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D095745419733BAD002D44C1 /* swiftz_core.framework */; };
Expand All @@ -403,6 +399,10 @@
D095745F197344E3002D44C1 /* DisposableSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D095745D197344E3002D44C1 /* DisposableSpec.swift */; };
D09574611973506C002D44C1 /* SchedulerSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D09574601973506C002D44C1 /* SchedulerSpec.swift */; };
D09574621973506C002D44C1 /* SchedulerSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D09574601973506C002D44C1 /* SchedulerSpec.swift */; };
D09C6CB8198F4923008E129B /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09C6CB7198F4923008E129B /* Nimble.framework */; };
D09C6CBA198F4929008E129B /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09C6CB9198F4929008E129B /* Nimble.framework */; };
D09C6CBC198F4931008E129B /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09C6CBB198F4931008E129B /* Quick.framework */; };
D09C6CBD198F4934008E129B /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09C6CBB198F4931008E129B /* Quick.framework */; };
D0E3CF551973AFC7004FD181 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E3CF541973AFC7004FD181 /* Errors.swift */; };
D0E3CF561973AFC7004FD181 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E3CF541973AFC7004FD181 /* Errors.swift */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -872,14 +872,15 @@
D0479989196671DF0066B267 /* EXTScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXTScope.h; sourceTree = "<group>"; };
D047998A196671DF0066B267 /* metamacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = metamacros.h; sourceTree = "<group>"; };
D0479995196673730066B267 /* ReactiveCocoa-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReactiveCocoa-Prefix.pch"; sourceTree = "<group>"; };
D0479998196673AC0066B267 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D0479999196673AC0066B267 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D047999E196678F20066B267 /* ObjectiveCBridgingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectiveCBridgingSpec.swift; sourceTree = "<group>"; };
D095745419733BAD002D44C1 /* swiftz_core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = swiftz_core.framework; path = "../../../../../../../../../Library/Developer/Xcode/DerivedData/ReactiveCocoa-fvhormsvfcxumbbehgudvscdctdn/Build/Products/Debug/swiftz_core.framework"; sourceTree = "<group>"; };
D095745719733F74002D44C1 /* AtomicSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AtomicSpec.swift; sourceTree = "<group>"; };
D095745A197341C2002D44C1 /* BagSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BagSpec.swift; sourceTree = "<group>"; };
D095745D197344E3002D44C1 /* DisposableSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisposableSpec.swift; sourceTree = "<group>"; };
D09574601973506C002D44C1 /* SchedulerSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchedulerSpec.swift; sourceTree = "<group>"; };
D09C6CB7198F4923008E129B /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = ../External/Quick/Externals/Nimble/build/Debug/Nimble.framework; sourceTree = "<group>"; };
D09C6CB9198F4929008E129B /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "../External/Quick/Externals/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = "<group>"; };
D09C6CBB198F4931008E129B /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = "../../../../../../../Library/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug/Quick.framework"; sourceTree = "<group>"; };
D0E3CF541973AFC7004FD181 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -896,8 +897,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D047999A196673AC0066B267 /* Nimble.framework in Frameworks */,
D047999B196673AC0066B267 /* Quick.framework in Frameworks */,
D09C6CBD198F4934008E129B /* Quick.framework in Frameworks */,
D09C6CB8198F4923008E129B /* Nimble.framework in Frameworks */,
D047967F19666BF30066B267 /* ReactiveCocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -914,8 +915,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D047999C196673B00066B267 /* Nimble.framework in Frameworks */,
D047999D196673B00066B267 /* Quick.framework in Frameworks */,
D09C6CBC198F4931008E129B /* Quick.framework in Frameworks */,
D09C6CBA198F4929008E129B /* Nimble.framework in Frameworks */,
D04796A519666CBF0066B267 /* ReactiveCocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -978,8 +979,9 @@
D047968319666BF30066B267 /* Supporting Files */ = {
isa = PBXGroup;
children = (
D0479998196673AC0066B267 /* Nimble.framework */,
D0479999196673AC0066B267 /* Quick.framework */,
D09C6CBB198F4931008E129B /* Quick.framework */,
D09C6CB9198F4929008E129B /* Nimble.framework */,
D09C6CB7198F4923008E129B /* Nimble.framework */,
D047968419666BF30066B267 /* Info.plist */,
);
name = "Supporting Files";
Expand Down Expand Up @@ -2142,6 +2144,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D04796E719666CE40066B267 /* Mac-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -2152,6 +2159,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D04796E719666CE40066B267 /* Mac-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2199,6 +2211,8 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug-iphoneos",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
Expand All @@ -2216,6 +2230,8 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug-iphoneos",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
Expand Down Expand Up @@ -2261,6 +2277,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D04796E719666CE40066B267 /* Mac-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2291,6 +2312,8 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug-iphoneos",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
Expand Down Expand Up @@ -2337,6 +2360,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D04796E719666CE40066B267 /* Mac-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2368,6 +2396,8 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/External/Quick/Externals/Nimble/build/Debug-iphoneos",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/ReactiveCocoa-anedscstkitsydccssaxwasrgsku/Build/Products/Debug",
);
GCC_PREFIX_HEADER = "ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch";
INFOPLIST_FILE = ReactiveCocoaTests/Info.plist;
Expand Down
4 changes: 2 additions & 2 deletions ReactiveCocoa.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bf931f6

Please sign in to comment.