Skip to content

Commit

Permalink
Merge branch 'master' into swift-development
Browse files Browse the repository at this point in the history
  • Loading branch information
@jspahrsummers
jspahrsummers committed Mar 22, 2015
2 parents ad02d83 + e1db682 commit b1e7f28
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 499 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[submodule "Carthage.checkout/Nimble"]
[submodule "Carthage/Checkouts/Nimble"]
path = Carthage/Checkouts/Nimble
url = https://github.com/Quick/Nimble.git
[submodule "Carthage.checkout/Quick"]
[submodule "Carthage/Checkouts/Quick"]
path = Carthage/Checkouts/Quick
url = https://github.com/Quick/Quick.git
[submodule "Carthage.checkout/xcconfigs"]
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "Carthage.checkout/LlamaKit"]
Expand Down
13 changes: 0 additions & 13 deletions Documentation/FrameworkOverview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,18 +176,6 @@ a [stream](#streams):
It is primarily used by the `-materialize` method of
[RACSignal][RACSignal+Operations].

## Asynchronous Backtraces

Because RAC-based code often involves asynchronous work and queue-hopping, the
framework supports [capturing asynchronous backtraces][RACBacktrace] to make debugging
easier.

On OS X, backtraces can be automatically captured from any code, including
system libraries.

On iOS, only queue hops from within RAC and your project will be captured (but
the information is still valuable).

[Design Guidelines]: DesignGuidelines.md
[Haskell]: http://www.haskell.org
[lazy-seq]: http://clojure.github.com/clojure/clojure.core-api.html#clojure.core/lazy-seq
Expand All @@ -197,7 +185,6 @@ the information is still valuable).
[Monoid]: http://downloads.haskell.org/~ghc/latest/docs/html/libraries/base-4.7.0.2/Data-Monoid.html
[MonadZip]: http://downloads.haskell.org/~ghc/latest/docs/html/libraries/base-4.7.0.2/Control-Monad-Zip.html
[NSButton+RACCommandSupport]: ../ReactiveCocoa/NSButton+RACCommandSupport.h
[RACBacktrace]: ../ReactiveCocoa/RACBacktrace.h
[RACCommand]: ../ReactiveCocoa/RACCommand.h
[RACDisposable]: ../ReactiveCocoa/RACDisposable.h
[RACEvent]: ../ReactiveCocoa/RACEvent.h
Expand Down
18 changes: 0 additions & 18 deletions ReactiveCocoa.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@
D037654B19EDA41200A782A9 /* NSUserDefaults+RACSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = D037645B19EDA41200A782A9 /* NSUserDefaults+RACSupport.m */; };
D037654E19EDA41200A782A9 /* RACArraySequence.m in Sources */ = {isa = PBXBuildFile; fileRef = D037645D19EDA41200A782A9 /* RACArraySequence.m */; };
D037654F19EDA41200A782A9 /* RACArraySequence.m in Sources */ = {isa = PBXBuildFile; fileRef = D037645D19EDA41200A782A9 /* RACArraySequence.m */; };
D037655019EDA41200A782A9 /* RACBacktrace.h in Headers */ = {isa = PBXBuildFile; fileRef = D037645E19EDA41200A782A9 /* RACBacktrace.h */; settings = {ATTRIBUTES = (Public, ); }; };
D037655119EDA41200A782A9 /* RACBacktrace.h in Headers */ = {isa = PBXBuildFile; fileRef = D037645E19EDA41200A782A9 /* RACBacktrace.h */; settings = {ATTRIBUTES = (Public, ); }; };
D037655219EDA41200A782A9 /* RACBacktrace.m in Sources */ = {isa = PBXBuildFile; fileRef = D037645F19EDA41200A782A9 /* RACBacktrace.m */; };
D037655319EDA41200A782A9 /* RACBacktrace.m in Sources */ = {isa = PBXBuildFile; fileRef = D037645F19EDA41200A782A9 /* RACBacktrace.m */; };
D037655619EDA41200A782A9 /* RACBehaviorSubject.m in Sources */ = {isa = PBXBuildFile; fileRef = D037646119EDA41200A782A9 /* RACBehaviorSubject.m */; };
D037655719EDA41200A782A9 /* RACBehaviorSubject.m in Sources */ = {isa = PBXBuildFile; fileRef = D037646119EDA41200A782A9 /* RACBehaviorSubject.m */; };
D037655A19EDA41200A782A9 /* RACBlockTrampoline.m in Sources */ = {isa = PBXBuildFile; fileRef = D037646319EDA41200A782A9 /* RACBlockTrampoline.m */; };
Expand Down Expand Up @@ -326,8 +322,6 @@
D03766D219EDA60000A782A9 /* NSURLConnectionRACSupportSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668319EDA60000A782A9 /* NSURLConnectionRACSupportSpec.m */; };
D03766D319EDA60000A782A9 /* NSUserDefaultsRACSupportSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668419EDA60000A782A9 /* NSUserDefaultsRACSupportSpec.m */; };
D03766D419EDA60000A782A9 /* NSUserDefaultsRACSupportSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668419EDA60000A782A9 /* NSUserDefaultsRACSupportSpec.m */; };
D03766D519EDA60000A782A9 /* RACBacktraceSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668519EDA60000A782A9 /* RACBacktraceSpec.m */; };
D03766D619EDA60000A782A9 /* RACBacktraceSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668519EDA60000A782A9 /* RACBacktraceSpec.m */; };
D03766D719EDA60000A782A9 /* RACBlockTrampolineSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668619EDA60000A782A9 /* RACBlockTrampolineSpec.m */; };
D03766D819EDA60000A782A9 /* RACBlockTrampolineSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668619EDA60000A782A9 /* RACBlockTrampolineSpec.m */; };
D03766D919EDA60000A782A9 /* RACChannelExamples.m in Sources */ = {isa = PBXBuildFile; fileRef = D037668819EDA60000A782A9 /* RACChannelExamples.m */; };
Expand Down Expand Up @@ -545,8 +539,6 @@
D037645B19EDA41200A782A9 /* NSUserDefaults+RACSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSUserDefaults+RACSupport.m"; sourceTree = "<group>"; };
D037645C19EDA41200A782A9 /* RACArraySequence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RACArraySequence.h; sourceTree = "<group>"; };
D037645D19EDA41200A782A9 /* RACArraySequence.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACArraySequence.m; sourceTree = "<group>"; };
D037645E19EDA41200A782A9 /* RACBacktrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RACBacktrace.h; sourceTree = "<group>"; };
D037645F19EDA41200A782A9 /* RACBacktrace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACBacktrace.m; sourceTree = "<group>"; };
D037646019EDA41200A782A9 /* RACBehaviorSubject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RACBehaviorSubject.h; sourceTree = "<group>"; };
D037646119EDA41200A782A9 /* RACBehaviorSubject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACBehaviorSubject.m; sourceTree = "<group>"; };
D037646219EDA41200A782A9 /* RACBlockTrampoline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RACBlockTrampoline.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -701,7 +693,6 @@
D037668119EDA60000A782A9 /* NSStringRACKeyPathUtilitiesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSStringRACKeyPathUtilitiesSpec.m; sourceTree = "<group>"; };
D037668319EDA60000A782A9 /* NSURLConnectionRACSupportSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSURLConnectionRACSupportSpec.m; sourceTree = "<group>"; };
D037668419EDA60000A782A9 /* NSUserDefaultsRACSupportSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSUserDefaultsRACSupportSpec.m; sourceTree = "<group>"; };
D037668519EDA60000A782A9 /* RACBacktraceSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACBacktraceSpec.m; sourceTree = "<group>"; };
D037668619EDA60000A782A9 /* RACBlockTrampolineSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACBlockTrampolineSpec.m; sourceTree = "<group>"; };
D037668719EDA60000A782A9 /* RACChannelExamples.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RACChannelExamples.h; sourceTree = "<group>"; };
D037668819EDA60000A782A9 /* RACChannelExamples.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACChannelExamples.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -898,8 +889,6 @@
D037645B19EDA41200A782A9 /* NSUserDefaults+RACSupport.m */,
D037645C19EDA41200A782A9 /* RACArraySequence.h */,
D037645D19EDA41200A782A9 /* RACArraySequence.m */,
D037645E19EDA41200A782A9 /* RACBacktrace.h */,
D037645F19EDA41200A782A9 /* RACBacktrace.m */,
D037646019EDA41200A782A9 /* RACBehaviorSubject.h */,
D037646119EDA41200A782A9 /* RACBehaviorSubject.m */,
D037646219EDA41200A782A9 /* RACBlockTrampoline.h */,
Expand Down Expand Up @@ -1072,7 +1061,6 @@
D037668119EDA60000A782A9 /* NSStringRACKeyPathUtilitiesSpec.m */,
D037668319EDA60000A782A9 /* NSURLConnectionRACSupportSpec.m */,
D037668419EDA60000A782A9 /* NSUserDefaultsRACSupportSpec.m */,
D037668519EDA60000A782A9 /* RACBacktraceSpec.m */,
D037668619EDA60000A782A9 /* RACBlockTrampolineSpec.m */,
D037668719EDA60000A782A9 /* RACChannelExamples.h */,
D037668819EDA60000A782A9 /* RACChannelExamples.m */,
Expand Down Expand Up @@ -1334,7 +1322,6 @@
D037651419EDA41200A782A9 /* NSObject+RACDeallocating.h in Headers */,
D037650C19EDA41200A782A9 /* NSNotificationCenter+RACSupport.h in Headers */,
D037667319EDA57100A782A9 /* metamacros.h in Headers */,
D037655019EDA41200A782A9 /* RACBacktrace.h in Headers */,
D037666B19EDA57100A782A9 /* EXTKeyPathCoding.h in Headers */,
D03765F419EDA41200A782A9 /* RACSubscriptingAssignmentTrampoline.h in Headers */,
D03765C419EDA41200A782A9 /* RACScheduler+Subclass.h in Headers */,
Expand Down Expand Up @@ -1420,7 +1407,6 @@
D03765C519EDA41200A782A9 /* RACScheduler+Subclass.h in Headers */,
D03765E119EDA41200A782A9 /* RACStream.h in Headers */,
D03765D719EDA41200A782A9 /* RACSignal+Operations.h in Headers */,
D037655119EDA41200A782A9 /* RACBacktrace.h in Headers */,
D037665D19EDA41200A782A9 /* UITextField+RACSignalSupport.h in Headers */,
D037664919EDA41200A782A9 /* UISlider+RACSignalSupport.h in Headers */,
D03765BF19EDA41200A782A9 /* RACScheduler.h in Headers */,
Expand Down Expand Up @@ -1697,7 +1683,6 @@
D037658C19EDA41200A782A9 /* RACEvent.m in Sources */,
D08C54B81A69A9D000AD8286 /* SignalProducer.swift in Sources */,
D03765B219EDA41200A782A9 /* RACQueueScheduler.m in Sources */,
D037655219EDA41200A782A9 /* RACBacktrace.m in Sources */,
D037652A19EDA41200A782A9 /* NSObject+RACSelectorSignal.m in Sources */,
D03765AE19EDA41200A782A9 /* RACPassthroughSubscriber.m in Sources */,
D03765BC19EDA41200A782A9 /* RACReturnSignal.m in Sources */,
Expand Down Expand Up @@ -1738,7 +1723,6 @@
7A7065841A3F8967001E8354 /* RACKVOProxySpec.m in Sources */,
D037670719EDA60000A782A9 /* RACSubscriberSpec.m in Sources */,
D03766EF19EDA60000A782A9 /* RACPropertySignalExamples.m in Sources */,
D03766D519EDA60000A782A9 /* RACBacktraceSpec.m in Sources */,
D037670519EDA60000A782A9 /* RACSubscriberExamples.m in Sources */,
D0A226081A72E0E900D33B74 /* SignalSpec.swift in Sources */,
D0C3132219EF2D9700984962 /* RACTestSchedulerSpec.m in Sources */,
Expand Down Expand Up @@ -1868,7 +1852,6 @@
7A7065821A3F88B8001E8354 /* RACKVOProxy.m in Sources */,
D037658D19EDA41200A782A9 /* RACEvent.m in Sources */,
D03765B319EDA41200A782A9 /* RACQueueScheduler.m in Sources */,
D037655319EDA41200A782A9 /* RACBacktrace.m in Sources */,
D037665719EDA41200A782A9 /* UITableViewCell+RACSignalSupport.m in Sources */,
D037652B19EDA41200A782A9 /* NSObject+RACSelectorSignal.m in Sources */,
D03765AF19EDA41200A782A9 /* RACPassthroughSubscriber.m in Sources */,
Expand Down Expand Up @@ -1921,7 +1904,6 @@
D037670819EDA60000A782A9 /* RACSubscriberSpec.m in Sources */,
D037671C19EDA60000A782A9 /* UIAlertViewRACSupportSpec.m in Sources */,
D03766F019EDA60000A782A9 /* RACPropertySignalExamples.m in Sources */,
D03766D619EDA60000A782A9 /* RACBacktraceSpec.m in Sources */,
D037670619EDA60000A782A9 /* RACSubscriberExamples.m in Sources */,
D03766D819EDA60000A782A9 /* RACBlockTrampolineSpec.m in Sources */,
D037670019EDA60000A782A9 /* RACStreamExamples.m in Sources */,
Expand Down
70 changes: 0 additions & 70 deletions ReactiveCocoa/Objective-C/RACBacktrace.h
View file

This file was deleted.

Loading

0 comments on commit b1e7f28

Please sign in to comment.