Skip to content

Commit e0e3445

Browse files
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)

0 commit comments

Comments
 (0)