Fix FoundationNetworking imports for Linux builds

See https://github.com/apple/swift-corelibs-foundation/blob/a264bfd40af8412161cdc05be11c1cf35f6a56f1/Docs/ReleaseNotes_Swift5.md#dependency-management
ReactiveX · Mar 3, 2020 · bc9b693 · bc9b693
1 parent 4c87901
commit bc9b693
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ DerivedData
 *.o
 
 timeline.xctimeline
+.vscode
 
 # CocoaPods
 #

diff --git a/RxCocoa/Foundation/Logging.swift b/RxCocoa/Foundation/Logging.swift
@@ -6,7 +6,11 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if canImport(FoundationNetworking)
+import struct FoundationNetworking.URLRequest
+#else
 import struct Foundation.URLRequest
+#endif
 
 /// Simple logging settings for RxCocoa library.
 public struct Logging {

diff --git a/RxCocoa/Foundation/URLSession+Rx.swift b/RxCocoa/Foundation/URLSession+Rx.swift
@@ -7,18 +7,26 @@
 //
 
 import struct Foundation.URL
-import struct Foundation.URLRequest
 import struct Foundation.Data
 import struct Foundation.Date
 import struct Foundation.TimeInterval
-import class Foundation.HTTPURLResponse
-import class Foundation.URLSession
-import class Foundation.URLResponse
 import class Foundation.JSONSerialization
 import class Foundation.NSError
 import var Foundation.NSURLErrorCancelled
 import var Foundation.NSURLErrorDomain
 
+#if canImport(FoundationNetworking)
+import struct FoundationNetworking.URLRequest
+import class FoundationNetworking.HTTPURLResponse
+import class FoundationNetworking.URLSession
+import class FoundationNetworking.URLResponse
+#else
+import struct Foundation.URLRequest
+import class Foundation.HTTPURLResponse
+import class Foundation.URLSession
+import class Foundation.URLResponse
+#endif
+
 #if os(Linux)
     // don't know why
     import Foundation

diff --git a/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesAPI.swift b/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesAPI.swift
@@ -10,8 +10,8 @@ import RxSwift
 
 import struct Foundation.URL
 import struct Foundation.Data
-import struct Foundation.URLRequest
 import struct Foundation.NSRange
+import struct Foundation.URLRequest
 import class Foundation.HTTPURLResponse
 import class Foundation.URLSession
 import class Foundation.NSRegularExpression