Skip to content

Commit 5d0209b

Browse files
authored
Merge pull request #51 from ReactiveCocoa/xcode-10
Xcode 10 support
2 parents 30f84d2 + ca0b714 commit 5d0209b

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v7.0.3"
1+
github "Quick/Nimble" "v7.1.2"
22
github "Quick/Quick" "v1.2.0"
33
github "ReactiveCocoa/ReactiveObjC" "3.1.0"
44
github "ReactiveCocoa/ReactiveSwift" "3.1.0"

Carthage/Checkouts/Nimble

Submodule Nimble updated 34 files

ReactiveObjCBridge.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,7 @@
11131113
"$(PROJECT_DIR)/build/Debug",
11141114
);
11151115
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
1116+
MACOSX_DEPLOYMENT_TARGET = 10.10;
11161117
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
11171118
};
11181119
name = Debug;
@@ -1127,6 +1128,7 @@
11271128
"$(PROJECT_DIR)/build/Debug",
11281129
);
11291130
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
1131+
MACOSX_DEPLOYMENT_TARGET = 10.10;
11301132
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
11311133
};
11321134
name = Release;
@@ -1236,6 +1238,7 @@
12361238
"$(PROJECT_DIR)/build/Debug",
12371239
);
12381240
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
1241+
MACOSX_DEPLOYMENT_TARGET = 10.10;
12391242
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
12401243
};
12411244
name = Profile;
@@ -1315,6 +1318,7 @@
13151318
"$(PROJECT_DIR)/build/Debug",
13161319
);
13171320
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
1321+
MACOSX_DEPLOYMENT_TARGET = 10.10;
13181322
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
13191323
};
13201324
name = Test;

ReactiveObjCBridge/ObjectiveCBridging.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private final class RACSwiftScheduler: RACScheduler {
164164
}
165165
}
166166

167-
open override func schedule(_ block: @escaping () -> Void) -> RACDisposable? {
167+
override func schedule(_ block: @escaping () -> Void) -> RACDisposable? {
168168
switch base {
169169
case let .scheduler(scheduler):
170170
return scheduler.schedule(wrap(block)).map(RACDisposable.init)
@@ -174,7 +174,7 @@ private final class RACSwiftScheduler: RACScheduler {
174174
}
175175
}
176176

177-
open override func after(_ date: Date, schedule block: @escaping () -> Swift.Void) -> RACDisposable? {
177+
override func after(_ date: Date, schedule block: @escaping () -> Swift.Void) -> RACDisposable? {
178178
switch base {
179179
case let .scheduler(scheduler):
180180
Thread.sleep(until: date)
@@ -186,7 +186,7 @@ private final class RACSwiftScheduler: RACScheduler {
186186
}
187187
}
188188

189-
open override func after(_ date: Date, repeatingEvery interval: TimeInterval, withLeeway leeway: TimeInterval, schedule block: @escaping () -> Void) -> RACDisposable? {
189+
override func after(_ date: Date, repeatingEvery interval: TimeInterval, withLeeway leeway: TimeInterval, schedule block: @escaping () -> Void) -> RACDisposable? {
190190
switch base {
191191
case let .scheduler(scheduler):
192192
assertionFailure("Undefined behavior.")
@@ -418,7 +418,7 @@ extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject
418418
}
419419

420420
extension Action {
421-
fileprivate var isEnabled: RACSignal<NSNumber> {
421+
fileprivate var isEnabledSignal: RACSignal<NSNumber> {
422422
return self.isEnabled.producer.map { $0 as NSNumber }.bridged
423423
}
424424
}
@@ -462,7 +462,7 @@ extension Action where Input: AnyObject, Output: AnyObject {
462462
/// when the action is. However, the reverse is always true: the Action
463463
/// will always be marked as executing when the `RACCommand` is.
464464
public var bridged: RACCommand<Input, Output> {
465-
return RACCommand<Input, Output>(enabled: isEnabled) { input -> RACSignal<Output> in
465+
return RACCommand<Input, Output>(enabled: isEnabledSignal) { input -> RACSignal<Output> in
466466
return self.apply(input!).bridged
467467
}
468468
}
@@ -478,7 +478,7 @@ extension Action where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output
478478
/// when the action is. However, the reverse is always true: the Action
479479
/// will always be marked as executing when the `RACCommand` is.
480480
public var bridged: RACCommand<Input.Wrapped, Output> {
481-
return RACCommand<Input.Wrapped, Output>(enabled: isEnabled) { input -> RACSignal<Output> in
481+
return RACCommand<Input.Wrapped, Output>(enabled: isEnabledSignal) { input -> RACSignal<Output> in
482482
return self.apply(Input(reconstructing: input)).bridged
483483
}
484484
}
@@ -494,7 +494,7 @@ extension Action where Input: AnyObject, Output: OptionalProtocol, Output.Wrappe
494494
/// when the action is. However, the reverse is always true: the Action
495495
/// will always be marked as executing when the `RACCommand` is.
496496
public var bridged: RACCommand<Input, Output.Wrapped> {
497-
return RACCommand<Input, Output.Wrapped>(enabled: isEnabled) { input -> RACSignal<Output.Wrapped> in
497+
return RACCommand<Input, Output.Wrapped>(enabled: isEnabledSignal) { input -> RACSignal<Output.Wrapped> in
498498
return self.apply(input!).bridged
499499
}
500500
}
@@ -510,7 +510,7 @@ extension Action where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output
510510
/// when the action is. However, the reverse is always true: the Action
511511
/// will always be marked as executing when the RACCommand is.
512512
public var bridged: RACCommand<Input.Wrapped, Output.Wrapped> {
513-
return RACCommand<Input.Wrapped, Output.Wrapped>(enabled: isEnabled) { input -> RACSignal<Output.Wrapped> in
513+
return RACCommand<Input.Wrapped, Output.Wrapped>(enabled: isEnabledSignal) { input -> RACSignal<Output.Wrapped> in
514514
return self.apply(Input(reconstructing: input)).bridged
515515
}
516516
}

0 commit comments

Comments
 (0)