Skip to content

Commit 590b569

Browse files
neilpaneilpa
committed
Merge pull request #72 from neilpa/more-targets
Add tvOS and watchOS targets
2 parents 6551cdb + c695679 commit 590b569

File tree

9 files changed

+632
-13
lines changed

9 files changed

+632
-13
lines changed

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.4"
1+
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-RC.1"

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "antitypical/Result" "1.0.0"
2-
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.4"
1+
github "antitypical/Result" "1.0.1"
2+
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-RC.1"

‎Rex.xcodeproj/project.pbxproj‎

Lines changed: 439 additions & 1 deletion
Large diffs are not rendered by default.

‎Rex.xcodeproj/xcshareddata/xcschemes/Rex-Mac.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -66,11 +66,11 @@
6666
</AdditionalOptions>
6767
</TestAction>
6868
<LaunchAction
69+
buildConfiguration = "Debug"
6970
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7071
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7172
launchStyle = "0"
7273
useCustomWorkingDirectory = "NO"
73-
buildConfiguration = "Debug"
7474
ignoresPersistentStateOnLaunch = "NO"
7575
debugDocumentVersioning = "YES"
7676
debugServiceExtension = "internal"
@@ -88,10 +88,10 @@
8888
</AdditionalOptions>
8989
</LaunchAction>
9090
<ProfileAction
91+
buildConfiguration = "Release"
9192
shouldUseLaunchSchemeArgsEnv = "YES"
9293
savedToolIdentifier = ""
9394
useCustomWorkingDirectory = "NO"
94-
buildConfiguration = "Release"
9595
debugDocumentVersioning = "YES">
9696
<MacroExpansion>
9797
<BuildableReference

‎Rex.xcodeproj/xcshareddata/xcschemes/Rex-iOS.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -66,11 +66,11 @@
6666
</AdditionalOptions>
6767
</TestAction>
6868
<LaunchAction
69+
buildConfiguration = "Debug"
6970
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7071
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7172
launchStyle = "0"
7273
useCustomWorkingDirectory = "NO"
73-
buildConfiguration = "Debug"
7474
ignoresPersistentStateOnLaunch = "NO"
7575
debugDocumentVersioning = "YES"
7676
debugServiceExtension = "internal"
@@ -88,10 +88,10 @@
8888
</AdditionalOptions>
8989
</LaunchAction>
9090
<ProfileAction
91+
buildConfiguration = "Release"
9192
shouldUseLaunchSchemeArgsEnv = "YES"
9293
savedToolIdentifier = ""
9394
useCustomWorkingDirectory = "NO"
94-
buildConfiguration = "Release"
9595
debugDocumentVersioning = "YES">
9696
<MacroExpansion>
9797
<BuildableReference

‎Rex.xcodeproj/xcshareddata/xcschemes/Rex-tvOS.xcscheme‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D8715DAF1C21123E005F4191"
18+
BuildableName = "Rex.framework"
19+
BlueprintName = "Rex-tvOS"
20+
ReferencedContainer = "container:Rex.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "D8715DD01C21160A005F4191"
36+
BuildableName = "RexTests-tvOS.xctest"
37+
BlueprintName = "RexTests-tvOS"
38+
ReferencedContainer = "container:Rex.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "D8715DAF1C21123E005F4191"
46+
BuildableName = "Rex.framework"
47+
BlueprintName = "Rex-tvOS"
48+
ReferencedContainer = "container:Rex.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<MacroExpansion>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "D8715DAF1C21123E005F4191"
68+
BuildableName = "Rex.framework"
69+
BlueprintName = "Rex-tvOS"
70+
ReferencedContainer = "container:Rex.xcodeproj">
71+
</BuildableReference>
72+
</MacroExpansion>
73+
<AdditionalOptions>
74+
</AdditionalOptions>
75+
</LaunchAction>
76+
<ProfileAction
77+
buildConfiguration = "Release"
78+
shouldUseLaunchSchemeArgsEnv = "YES"
79+
savedToolIdentifier = ""
80+
useCustomWorkingDirectory = "NO"
81+
debugDocumentVersioning = "YES">
82+
<MacroExpansion>
83+
<BuildableReference
84+
BuildableIdentifier = "primary"
85+
BlueprintIdentifier = "D8715DAF1C21123E005F4191"
86+
BuildableName = "Rex.framework"
87+
BlueprintName = "Rex-tvOS"
88+
ReferencedContainer = "container:Rex.xcodeproj">
89+
</BuildableReference>
90+
</MacroExpansion>
91+
</ProfileAction>
92+
<AnalyzeAction
93+
buildConfiguration = "Debug">
94+
</AnalyzeAction>
95+
<ArchiveAction
96+
buildConfiguration = "Release"
97+
revealArchiveInOrganizer = "YES">
98+
</ArchiveAction>
99+
</Scheme>

‎Rex.xcodeproj/xcshareddata/xcschemes/Rex-watchOS.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D8715D931C210F97005F4191"
18+
BuildableName = "Rex.framework"
19+
BlueprintName = "Rex-watchOS"
20+
ReferencedContainer = "container:Rex.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "D8715D931C210F97005F4191"
49+
BuildableName = "Rex.framework"
50+
BlueprintName = "Rex-watchOS"
51+
ReferencedContainer = "container:Rex.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "D8715D931C210F97005F4191"
67+
BuildableName = "Rex.framework"
68+
BlueprintName = "Rex-watchOS"
69+
ReferencedContainer = "container:Rex.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎Source/Rex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright (c) 2015 Neil Pankey. All rights reserved.
77
//
88

9-
#import <Cocoa/Cocoa.h>
9+
#import <Foundation/Foundation.h>
1010

1111
//! Project version number for Rex.
1212
FOUNDATION_EXPORT double RexVersionNumber;

‎Source/UIKit/UIControl.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ import ReactiveCocoa
1010
import UIKit
1111

1212
extension UIControl {
13+
#if os(iOS)
1314
/// Creates a producer for the sender whenever a specified control event is triggered.
1415
public func rex_controlEvents(events: UIControlEvents) -> SignalProducer<UIControl?, NoError> {
1516
return rac_signalForControlEvents(events)
1617
.toSignalProducer()
1718
.map { $0 as? UIControl }
1819
.flatMapError { _ in SignalProducer(value: nil) }
1920
}
21+
#endif
2022

2123
/// Wraps a control's `enabled` state in a bindable property.
2224
public var rex_enabled: MutableProperty<Bool> {

0 commit comments

Comments
 (0)