From 75796c0adefccff8f34053a21b4ebbc4d6c86b17 Mon Sep 17 00:00:00 2001 From: krasich74 Date: Tue, 1 Sep 2020 16:12:35 +0300 Subject: [PATCH] Fixed pr comments pt.1 --- Sources/Classes/Services/SessionManager.swift | 13 +++++-------- .../Drawing/UIImage/UIImage+Extensions.swift | 2 -- .../Support/UIScrollView+Support.swift | 17 ++--------------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Sources/Classes/Services/SessionManager.swift b/Sources/Classes/Services/SessionManager.swift index 95f1242f..8bb23edd 100644 --- a/Sources/Classes/Services/SessionManager.swift +++ b/Sources/Classes/Services/SessionManager.swift @@ -48,15 +48,13 @@ open class SessionManager: Alamofire.Session { let delegate = SessionDelegate() let delegateQueue = OperationQueue() - - let queue = DispatchQueue(label: "org.alamofire.session.rootQueue") - delegateQueue.underlyingQueue = queue + delegateQueue.underlyingQueue = mappingQueue let session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: delegateQueue) super.init(session: session, delegate: delegate, - rootQueue: queue, + rootQueue: mappingQueue, serverTrustManager: serverTrustManager) } @@ -68,13 +66,12 @@ open class SessionManager: Alamofire.Session { self.acceptableStatusCodes = acceptableStatusCodes self.mappingQueue = mappingQueue - - let queue = DispatchQueue(label: "org.alamofire.session.rootQueue") - session.delegateQueue.underlyingQueue = queue + + session.delegateQueue.underlyingQueue = mappingQueue super.init(session: session, delegate: delegate, - rootQueue: queue, + rootQueue: mappingQueue, serverTrustManager: serverTrustManager) } } diff --git a/Sources/Extensions/Drawing/UIImage/UIImage+Extensions.swift b/Sources/Extensions/Drawing/UIImage/UIImage+Extensions.swift index 20f7a487..8992b89b 100644 --- a/Sources/Extensions/Drawing/UIImage/UIImage+Extensions.swift +++ b/Sources/Extensions/Drawing/UIImage/UIImage+Extensions.swift @@ -22,7 +22,6 @@ import UIKit -@available(iOS 10.0, tvOS 10.0, *) public extension UIImage { /// Creates an image filled by given color. @@ -235,7 +234,6 @@ public extension UIImage { } } -@available(iOS 10.0, tvOS 10.0, *) internal extension DrawingOperation { func imageFromNewRenderer(scale: CGFloat) -> UIImage { diff --git a/Sources/Extensions/Support/UIScrollView+Support.swift b/Sources/Extensions/Support/UIScrollView+Support.swift index c72a387d..1e027069 100644 --- a/Sources/Extensions/Support/UIScrollView+Support.swift +++ b/Sources/Extensions/Support/UIScrollView+Support.swift @@ -25,23 +25,10 @@ import UIKit public extension Support where Base: UIScrollView { var refreshControl: UIRefreshControl? { - if #available(iOS 10.0, *) { - return base.refreshControl - } else { - return base.subviews.first { $0 is UIRefreshControl } as? UIRefreshControl - } + return base.refreshControl } func setRefreshControl(_ newRefreshControl: UIRefreshControl?) { - if #available(iOS 10.0, *) { - base.refreshControl = newRefreshControl - } else { - if let newControl = newRefreshControl { - refreshControl?.removeFromSuperview() - base.addSubview(newControl) - } else { - refreshControl?.removeFromSuperview() - } - } + base.refreshControl = newRefreshControl } }