kylefang/ReactiveCocoa
1
0
Fork 0
mirror of https://github.com/zhigang1992/ReactiveCocoa.git synced 2026-06-13 09:35:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,964 Commits 34 Branches 103 Tags
protocol-extensions
Commit Graph

42 Commits

Author SHA1 Message Date
Neil Pankey
78503679f0 Update Result dependency 2015-06-08 15:44:17 -07:00
Syo Ikeda
0824363ad7 ++Result 2015-04-26 22:20:12 +09:00
Syo Ikeda
dde2021ece Remove LlamaKit 2015-04-22 19:21:48 +09:00
Syo Ikeda
1c623734e5 Add antitypical/Result dependency 2015-04-22 19:09:59 +09:00
Justin Spahr-Summers
b1e7f28f14 Merge branch 'master' into swift-development 2015-03-22 16:23:58 -07:00
Syo Ikeda
8a1d262d41 Update gitmodules too 2015-03-21 22:35:35 +09:00
Justin Spahr-Summers
ded27ea6a2 Use real LlamaKit, not Carthage's fork 2015-01-17 22:29:26 -08:00
Justin Spahr-Summers
e77f6abce6 Update to Carthage 0.5 directory structure 2014-12-29 15:56:46 -08:00
Joseph Constantakis
4875c6c51b update to carthage 0.4 directory structure 2014-12-25 00:06:16 -05:00
Robert Böhnke
d8e0fea2d0 Update .gitmodules 2014-11-26 10:46:57 +01:00
Justin Spahr-Summers
3d5a41fb3c Merge branch 'cartfile' into swift-cartfile 
Conflicts:
	Carthage.checkout/xcconfigs
 2014-11-21 12:13:22 -08:00
Justin Spahr-Summers
8ef937e9ec Revert "Don't use Carthage for xcconfigs" 
This reverts commit 8806d6b878.

Conflicts:
	Carthage.checkout/xcconfigs
 2014-11-21 12:12:56 -08:00
Justin Spahr-Summers
02daaa8547 Merge branch 'cartfile' into swift-cartfile 
Conflicts:
	Configuration
 2014-11-21 11:47:10 -08:00
Justin Spahr-Summers
8806d6b878 Don't use Carthage for xcconfigs 
We always want this to be present, so we don’t want Carthage to
skip it because of its path.
 2014-11-21 11:41:02 -08:00
Justin Spahr-Summers
4d8f1ba389 Move LlamaKit to Cartfile as well 2014-11-20 15:11:06 -08:00
Justin Spahr-Summers
df6b58865f Merge branch 'cartfile' into swift-cartfile 
Conflicts:
	.gitmodules
 2014-11-20 15:09:35 -08:00
Justin Spahr-Summers
358c52e91d Use Carthage for submodules 2014-11-20 14:25:17 -08:00
Justin Spahr-Summers
ef019ace43 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
 2014-10-15 15:25:14 -07:00
Justin Spahr-Summers
afa8855961 Add Quick submodule 2014-10-07 15:18:25 -07:00
Justin Spahr-Summers
58ccbabd2e ++xcconfigs, 🔥 Expecta and Specta 2014-10-07 15:17:47 -07:00
Justin Spahr-Summers
fc8d5038de Use ReactiveCocoa/LlamaKit for important fixes 2014-09-26 22:01:56 -07:00
Justin Spahr-Summers
ec959a79e4 Replace swiftz_core with LlamaKit 2014-09-26 21:47:11 -07:00
Justin Spahr-Summers
bf931f68e9 ++Quick to latest master 2014-08-03 21:53:50 -07:00
Justin Spahr-Summers
c47558730b Link swiftz-core (from maxpow4h/swiftz) into RAC 2014-07-13 15:12:42 -07:00
Justin Spahr-Summers
9a0e2c4f6e Fix up submodule references 2014-07-03 23:20:29 -07:00
Justin Spahr-Summers
bf4213db52 Add modocache/Quick as a submodule 2014-07-03 21:56:30 -07:00
Matt Diephouse
dcfa7bac27 Move to specta/specta, specta/expecta, and XCTest 2014-06-27 15:46:04 -04:00
Justin Spahr-Summers
c3259cb83f Merge remote-tracking branch 'origin/2.0-development' into signal-for-selector-from-protocol 
Conflicts:
	.gitmodules
	ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj
	ReactiveCocoaFramework/ReactiveCocoa/RACEventTrampoline.h
	ReactiveCocoaFramework/ReactiveCocoa/RACObservablePropertySubject.m
	ReactiveCocoaFramework/ReactiveCocoa/ReactiveCocoa.h
 2013-06-24 21:04:23 -07:00
Justin Spahr-Summers
c55f57d1be Remove .gitmodules entry for libextobjc 2013-06-23 09:58:40 -07:00
Justin Spahr-Summers
70d1013fee Re-add jspahrsummers/xcconfigs into the external/ folder 2013-06-23 09:32:32 -07:00
Justin Spahr-Summers
4be18a9abe Remove now-unused JRSwizzle and RACSwizzling 2013-06-22 15:37:07 -07:00
Justin Spahr-Summers
def0c7619d Remove demos, which will now be in their own repos 
https://github.com/ReactiveCocoa/GHAPIDemo
https://github.com/ReactiveCocoa/RACiOSDemo
 2013-01-29 18:35:42 -08:00
Justin Spahr-Summers
1331ea661c Moved libextobjc into ReactiveCocoa folder 
This way, it should be part of header search paths automatically.
 2012-09-04 13:46:57 -07:00
Justin Spahr-Summers
76cc48eda4 Adding jspahrsummers/libextobjc as a submodule 2012-09-04 13:10:53 -07:00
Justin Spahr-Summers
13b200e5c5 Go back to github/specta 
Requires a git submodule sync!

Turns out there's some stuff in the GitHub fork that doesn't exist on petejkim/specta (see petejkim/specta#10 and petejkim/specta#11).
 2012-08-08 13:28:31 -07:00
Justin Spahr-Summers
cbdc86b625 Adding jspahrsummers/xcconfigs as a submodule 2012-08-02 14:52:56 -07:00
Justin Spahr-Summers
9b19706f4e Re-pointed Specta submodule to the latest master of petejkim/specta 2012-07-30 12:41:11 -07:00
joshaber
8d39894d33 added JRSwizzle as a submodule 2012-07-14 14:32:00 -04:00
joshaber
54dc6e3d2c use the git read-only URLs for submodules 2012-05-07 16:17:46 -04:00
joshaber
aeb5f26435 do the actual GH API call 2012-03-06 21:28:05 -05:00
joshaber
fe2d7883fb more reorganizing 2012-03-05 16:45:19 -05:00
joshaber
67df06a985 added specta and expect for testing 2012-03-02 23:02:49 -05:00