Skip to content

Commit e0e3445

Browse files
kzaherkzaher
committed
Removes RX_NO_MODULE.
1 parent 4bf6613 commit e0e3445

File tree

152 files changed

+124
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+124
-446
lines changed

‎RxBlocking/BlockingObservable+Operators.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
import RxSwift
1210

1311
/// The `MaterializedSequenceResult` enum represents the materialized
1412
/// output of a BlockingObservable.

‎RxBlocking/BlockingObservable.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
import RxSwift
1210

1311
/**
1412
`BlockingObservable` is a variety of `Observable` that provides blocking operators.

‎RxBlocking/ObservableConvertibleType+Blocking.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
109
import RxSwift
11-
#endif
1210

1311
extension ObservableConvertibleType {
1412
/// Converts an Observable into a `BlockingObservable` (an Observable with blocking operators).

‎RxBlocking/RunLoopLock.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
import CoreFoundation
1010

11-
#if !RX_NO_MODULE
12-
import RxSwift
13-
#endif
11+
import RxSwift
1412

1513
#if os(Linux)
1614
import Foundation

‎RxCocoa/Common/ControlTarget.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
#if os(iOS) || os(tvOS) || os(macOS)
1010

11-
#if !RX_NO_MODULE
1211
import RxSwift
13-
#endif
1412

1513
#if os(iOS) || os(tvOS)
1614
import UIKit

‎RxCocoa/Common/DelegateProxy.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88

99
#if !os(Linux)
1010

11-
#if !RX_NO_MODULE
1211
import RxSwift
13-
#if SWIFT_PACKAGE && !os(Linux)
14-
import RxCocoaRuntime
15-
#endif
16-
#endif
12+
#if SWIFT_PACKAGE && !os(Linux)
13+
import RxCocoaRuntime
14+
#endif
1715

1816
/// Base class for `DelegateProxyType` protocol.
1917
///

‎RxCocoa/Common/DelegateProxyType.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import func Foundation.objc_getAssociatedObject
1212
import func Foundation.objc_setAssociatedObject
1313

14-
#if !RX_NO_MODULE
15-
import RxSwift
16-
#endif
14+
import RxSwift
1715

1816
/**
1917
`DelegateProxyType` protocol enables using both normal delegates and Rx observable sequences with

‎RxCocoa/Common/NSLayoutConstraint+Rx.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
#if !os(Linux)
1010

1111
#if os(macOS)
12-
import Cocoa
12+
import Cocoa
1313
#else
14-
import UIKit
14+
import UIKit
1515
#endif
1616

17-
#if !RX_NO_MODULE
1817
import RxSwift
19-
#endif
2018

2119
#if os(iOS) || os(macOS) || os(tvOS)
2220
extension Reactive where Base: NSLayoutConstraint {

‎RxCocoa/Common/Observable+Bind.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
10+
import RxSwift
1211

1312
extension ObservableType {
1413

‎RxCocoa/Common/RxCocoaObjCRuntimeError+Extensions.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
// Copyright © 2016 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
#if SWIFT_PACKAGE && !DISABLE_SWIZZLING && !os(Linux)
11-
import RxCocoaRuntime
12-
#endif
9+
#if SWIFT_PACKAGE && !DISABLE_SWIZZLING && !os(Linux)
10+
import RxCocoaRuntime
1311
#endif
1412

1513
#if !DISABLE_SWIZZLING && !os(Linux)

‎RxCocoa/Common/RxTarget.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
import class Foundation.NSObject
1010

11-
#if !RX_NO_MODULE
1211
import RxSwift
13-
#endif
1412

1513
class RxTarget : NSObject
1614
, Disposable {

‎RxCocoa/Common/TextInput.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2016 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
import RxSwift
1210

1311
#if os(iOS) || os(tvOS)
1412
import UIKit

‎RxCocoa/Deprecated.swift

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
// Copyright © 2017 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
12-
9+
import RxSwift
1310
import Dispatch
1411

1512
extension ObservableType {
@@ -400,9 +397,7 @@ extension Reactive where Base: UIImageView {
400397
}
401398
#endif
402399

403-
#if !RX_NO_MODULE
404-
import RxSwift
405-
#endif
400+
import RxSwift
406401

407402
extension Variable {
408403
/// Converts `Variable` to `Driver` trait.

‎RxCocoa/Foundation/KVORepresentable+CoreGraphics.swift

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,19 @@
88

99
#if !os(Linux)
1010

11-
#if !RX_NO_MODULE
12-
import RxSwift
13-
#endif
14-
import CoreGraphics
11+
import RxSwift
12+
import CoreGraphics
1513

16-
import class Foundation.NSValue
14+
import class Foundation.NSValue
1715

1816
#if arch(x86_64) || arch(arm64)
19-
let CGRectType = "{CGRect={CGPoint=dd}{CGSize=dd}}"
20-
let CGSizeType = "{CGSize=dd}"
21-
let CGPointType = "{CGPoint=dd}"
17+
let CGRectType = "{CGRect={CGPoint=dd}{CGSize=dd}}"
18+
let CGSizeType = "{CGSize=dd}"
19+
let CGPointType = "{CGPoint=dd}"
2220
#elseif arch(i386) || arch(arm)
23-
let CGRectType = "{CGRect={CGPoint=ff}{CGSize=ff}}"
24-
let CGSizeType = "{CGSize=ff}"
25-
let CGPointType = "{CGPoint=ff}"
21+
let CGRectType = "{CGRect={CGPoint=ff}{CGSize=ff}}"
22+
let CGSizeType = "{CGSize=ff}"
23+
let CGPointType = "{CGPoint=ff}"
2624
#endif
2725

2826
extension CGRect : KVORepresentable {

‎RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,23 @@
99
#if !os(Linux)
1010

1111
import Foundation.NSObject
12-
#if !RX_NO_MODULE
13-
import RxSwift
14-
#endif
15-
16-
/// Key value observing options
17-
public struct KeyValueObservingOptions: OptionSet {
18-
/// Raw value
19-
public let rawValue: UInt
12+
import RxSwift
2013

21-
public init(rawValue: UInt) {
22-
self.rawValue = rawValue
23-
}
14+
/// Key value observing options
15+
public struct KeyValueObservingOptions: OptionSet {
16+
/// Raw value
17+
public let rawValue: UInt
2418

25-
/// Whether a sequence element should be sent to the observer immediately, before the subscribe method even returns.
26-
public static let initial = KeyValueObservingOptions(rawValue: 1 << 0)
27-
/// Whether to send updated values.
28-
public static let new = KeyValueObservingOptions(rawValue: 1 << 1)
19+
public init(rawValue: UInt) {
20+
self.rawValue = rawValue
2921
}
3022

23+
/// Whether a sequence element should be sent to the observer immediately, before the subscribe method even returns.
24+
public static let initial = KeyValueObservingOptions(rawValue: 1 << 0)
25+
/// Whether to send updated values.
26+
public static let new = KeyValueObservingOptions(rawValue: 1 << 1)
27+
}
28+
3129
extension Reactive where Base: NSObject {
3230

3331
/**

‎RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
#if !os(Linux)
1010

11+
import RxSwift
12+
1113
import Foundation.NSObject
12-
#if !RX_NO_MODULE
13-
import RxSwift
14-
#endif
1514

1615
extension Reactive where Base: NSObject {
1716
/**

‎RxCocoa/Foundation/NSObject+Rx.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
#if !os(Linux)
1010

1111
import Foundation.NSObject
12-
#if !RX_NO_MODULE
13-
import RxSwift
14-
#if SWIFT_PACKAGE && !DISABLE_SWIZZLING && !os(Linux)
15-
import RxCocoaRuntime
16-
#endif
12+
import RxSwift
13+
#if SWIFT_PACKAGE && !DISABLE_SWIZZLING && !os(Linux)
14+
import RxCocoaRuntime
1715
#endif
1816

1917
#if !DISABLE_SWIZZLING && !os(Linux)

‎RxCocoa/Foundation/NotificationCenter+Rx.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
import class Foundation.NotificationCenter
1010
import struct Foundation.Notification
1111

12-
#if !RX_NO_MODULE
1312
import RxSwift
14-
#endif
1513

1614
extension Reactive where Base: NotificationCenter {
1715
/**

‎RxCocoa/Foundation/URLSession+Rx.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ import var Foundation.NSURLErrorDomain
2424
import Foundation
2525
#endif
2626

27-
#if !RX_NO_MODULE
2827
import RxSwift
29-
#endif
3028

3129
/// RxCocoa URL errors.
3230
public enum RxCocoaURLError

‎RxCocoa/RxCocoa.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
import class Foundation.NSNull
1010

11-
#if !RX_NO_MODULE
1211
import RxSwift
13-
#endif
1412
#if os(iOS)
1513
import UIKit
1614
#endif
@@ -147,11 +145,8 @@ let delegateNotSet = "Delegate not set"
147145

148146
// MARK: Shared with RxSwift
149147

150-
#if !RX_NO_MODULE
151-
152148
func rxFatalError(_ lastMessage: String) -> Never {
153149
// The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
154150
fatalError(lastMessage)
155151
}
156152

157-
#endif

‎RxCocoa/Traits/BehaviorRelay.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2017 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
import RxSwift
1210

1311
/// BehaviorRelay is a wrapper for `BehaviorSubject`.
1412
///

‎RxCocoa/Traits/ControlEvent.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
import RxSwift
1210

1311
/// Protocol that enables extension of `ControlEvent`.
1412
public protocol ControlEventType : ObservableType {

‎RxCocoa/Traits/ControlProperty.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
109
import RxSwift
11-
#endif
1210

1311
/// Protocol that enables extension of `ControlProperty`.
1412
public protocol ControlPropertyType : ObservableType, ObserverType {

‎RxCocoa/Traits/Driver/BehaviorRelay+Driver.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2017 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
9+
import RxSwift
1210

1311
extension BehaviorRelay {
1412
/// Converts `BehaviorRelay` to `Driver`.

‎RxCocoa/Traits/Driver/ControlEvent+Driver.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
109
import RxSwift
11-
#endif
1210

1311
extension ControlEvent {
1412
/// Converts `ControlEvent` to `Driver` trait.

‎RxCocoa/Traits/Driver/ControlProperty+Driver.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
109
import RxSwift
11-
#endif
1210

1311
extension ControlProperty {
1412
/// Converts `ControlProperty` to `Driver` trait.

‎RxCocoa/Traits/Driver/Driver+Subscription.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
109
import RxSwift
11-
#endif
1210

1311
private let errorMessage = "`drive*` family of methods can be only called from `MainThread`.\n" +
1412
"This is required to ensure that the last replayed `Driver` element is delivered on `MainThread`.\n"

‎RxCocoa/Traits/Driver/Driver.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
// Copyright © 2016 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if !RX_NO_MODULE
10-
import RxSwift
11-
#endif
12-
9+
import RxSwift
1310

1411
/**
1512
Trait that represents observable sequence with following properties:

0 commit comments

Comments
 (0)