From db883ab96fdb849f630bc2607d28152c47a0bfc1 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sat, 29 Apr 2017 21:22:22 +0200 Subject: [PATCH] Makes imports more specific. --- Platform/RecursiveLock.swift | 2 +- RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift | 2 +- RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift | 2 +- RxCocoa/Foundation/NSObject+Rx.swift | 2 +- Tests/RxCocoaTests/NSObject+RxTests.swift | 3 ++- Tests/RxSwiftTests/AsyncSubjectTests.swift | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Platform/RecursiveLock.swift b/Platform/RecursiveLock.swift index 10b9bbb0b..c03471d50 100644 --- a/Platform/RecursiveLock.swift +++ b/Platform/RecursiveLock.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Krunoslav Zaher. All rights reserved. // -import Foundation +import class Foundation.NSRecursiveLock #if TRACE_RESOURCES class RecursiveLock: NSRecursiveLock { diff --git a/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift b/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift index cb2573ca2..93f2a7464 100644 --- a/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift +++ b/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift @@ -8,7 +8,7 @@ #if !os(Linux) -import Foundation +import Foundation.NSObject #if !RX_NO_MODULE import RxSwift #endif diff --git a/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift b/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift index 897cdb3c3..63449ce04 100644 --- a/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift +++ b/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift @@ -8,7 +8,7 @@ #if !os(Linux) -import Foundation +import Foundation.NSObject #if !RX_NO_MODULE import RxSwift #endif diff --git a/RxCocoa/Foundation/NSObject+Rx.swift b/RxCocoa/Foundation/NSObject+Rx.swift index 85b4a4a6e..9330c9b19 100644 --- a/RxCocoa/Foundation/NSObject+Rx.swift +++ b/RxCocoa/Foundation/NSObject+Rx.swift @@ -8,7 +8,7 @@ #if !os(Linux) -import Foundation +import Foundation.NSObject #if !RX_NO_MODULE import RxSwift #if SWIFT_PACKAGE && !DISABLE_SWIZZLING && !os(Linux) diff --git a/Tests/RxCocoaTests/NSObject+RxTests.swift b/Tests/RxCocoaTests/NSObject+RxTests.swift index 80dc42f57..8d175b9bf 100644 --- a/Tests/RxCocoaTests/NSObject+RxTests.swift +++ b/Tests/RxCocoaTests/NSObject+RxTests.swift @@ -6,11 +6,12 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -import Foundation import RxSwift import RxCocoa import XCTest +import Foundation.NSObject + final class NSObjectTests: RxTest { } diff --git a/Tests/RxSwiftTests/AsyncSubjectTests.swift b/Tests/RxSwiftTests/AsyncSubjectTests.swift index 719b264d4..1522797f7 100644 --- a/Tests/RxSwiftTests/AsyncSubjectTests.swift +++ b/Tests/RxSwiftTests/AsyncSubjectTests.swift @@ -6,7 +6,6 @@ // Copyright © 2017 Krunoslav Zaher. All rights reserved. // -import Foundation import XCTest import RxSwift import RxTest