Skip to content

Commit

Permalink
Add watchOS target
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoSero committed Jul 23, 2015
1 parent fc54992 commit fef4ede
Show file tree
Hide file tree
Showing 10 changed files with 578 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "antitypical/Result" ~> 0.5
github "antitypical/Result" "9d5cc8edab9af8a25fcd9a2a106c5183f1289898"
3 changes: 2 additions & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "jspahrsummers/xcconfigs" ~> 0.8
github "jspahrsummers/xcconfigs" "98407abea4"
github "Quick/Quick" "e3c802b"
github "Quick/Nimble" "a804949"

8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "a804949542eb2f299b823ffb36936aec54fe0db6"
github "Quick/Quick" "e3c802be6c55710b39dba73caab9f234932c2ed7"
github "antitypical/Result" "0.5"
github "jspahrsummers/xcconfigs" "0.8.1"
github "Quick/Nimble" "5c52bbce08c971027995d8305d601b2a48ed1392"
github "Quick/Quick" "f4cd7f9ba545e766696749dc9257f1592e603c92"
github "antitypical/Result" "9d5cc8edab9af8a25fcd9a2a106c5183f1289898"
github "jspahrsummers/xcconfigs" "98407abea4d849462c7707d4578036cd26205ed2"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
479 changes: 479 additions & 0 deletions ReactiveCocoa.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B315531B3940610001CB9C"
BuildableName = "ReactiveCocoa.framework"
BlueprintName = "ReactiveCocoa-watchOS"
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B315531B3940610001CB9C"
BuildableName = "ReactiveCocoa.framework"
BlueprintName = "ReactiveCocoa-watchOS"
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B315531B3940610001CB9C"
BuildableName = "ReactiveCocoa.framework"
BlueprintName = "ReactiveCocoa-watchOS"
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
6 changes: 4 additions & 2 deletions ReactiveCocoa/Objective-C/NSURLConnection+RACSupport.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ + (RACSignal *)rac_sendAsynchronousRequest:(NSURLRequest *)request {
createSignal:^(id<RACSubscriber> subscriber) {
NSOperationQueue *queue = [[NSOperationQueue alloc] init];
queue.name = @"org.reactivecocoa.ReactiveCocoa.NSURLConnectionRACSupport";

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse *response, NSData *data, NSError *error) {
// The docs say that `nil` data means an error occurred, but
// `nil` responses can also occur in practice (circumstances
Expand All @@ -36,7 +37,8 @@ + (RACSignal *)rac_sendAsynchronousRequest:(NSURLRequest *)request {
[subscriber sendCompleted];
}
}];

#pragma clang diagnostic pop

return [RACDisposable disposableWithBlock:^{
// It's not clear if this will actually cancel the connection,
// but we can at least prevent _some_ unnecessary work --
Expand Down
4 changes: 4 additions & 0 deletions ReactiveCocoa/Objective-C/RACPassthroughSubscriber.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#import "RACSignal.h"
#import "RACSignalProvider.h"

#if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED

static const char *cleanedDTraceString(NSString *original) {
return [original stringByReplacingOccurrencesOfString:@"\\s+" withString:@" " options:NSRegularExpressionSearch range:NSMakeRange(0, original.length)].UTF8String;
}
Expand All @@ -26,6 +28,8 @@
return cleanedDTraceString(desc);
}

#endif

@interface RACPassthroughSubscriber ()

// The subscriber to which events should be forwarded.
Expand Down
3 changes: 2 additions & 1 deletion ReactiveCocoa/ReactiveCocoa.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ FOUNDATION_EXPORT const unsigned char ReactiveCocoaVersionString[];
#import <ReactiveCocoa/RACTuple.h>
#import <ReactiveCocoa/RACUnit.h>

#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
#ifdef TARGET_OS_WATCH
#elif __IPHONE_OS_VERSION_MIN_REQUIRED
#import <ReactiveCocoa/MKAnnotationView+RACSignalSupport.h>
#import <ReactiveCocoa/UIActionSheet+RACSignalSupport.h>
#import <ReactiveCocoa/UIAlertView+RACSignalSupport.h>
Expand Down

0 comments on commit fef4ede

Please sign in to comment.