From e45b566ed2d80c12bef278e03c153ec1ae438d6a Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 4 Sep 2020 18:46:15 +0300 Subject: [PATCH 1/5] Fix mappingQueue in SessionManager --- LeadKit.podspec | 2 +- Sources/Classes/Services/SessionManager.swift | 4 ++++ .../NetworkService/NetworkServiceConfiguration.swift | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/LeadKit.podspec b/LeadKit.podspec index f2c5d9de..02549dca 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKit" - s.version = "0.10.2" + s.version = "0.10.3" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/TouchInstinct/LeadKit" s.license = "Apache License, Version 2.0" diff --git a/Sources/Classes/Services/SessionManager.swift b/Sources/Classes/Services/SessionManager.swift index 9a1ed574..b212b2a7 100644 --- a/Sources/Classes/Services/SessionManager.swift +++ b/Sources/Classes/Services/SessionManager.swift @@ -55,6 +55,8 @@ open class SessionManager: Alamofire.Session { super.init(session: session, delegate: delegate, rootQueue: mappingQueue, + requestQueue: .global(), + serializationQueue: .global(), serverTrustManager: serverTrustManager) } @@ -72,6 +74,8 @@ open class SessionManager: Alamofire.Session { super.init(session: session, delegate: delegate, rootQueue: mappingQueue, + requestQueue: .global(), + serializationQueue: .global(), serverTrustManager: serverTrustManager) } } diff --git a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift index 1bcac763..ab5a7094 100644 --- a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift +++ b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift @@ -72,7 +72,7 @@ public extension NetworkServiceConfiguration { serverTrustManager: ServerTrustManager(allHostsMustBeEvaluated: !serverTrustPolicies.isEmpty, evaluators: serverTrustPolicies), acceptableStatusCodes: acceptableStatusCodes, - mappingQueue: .global()) + mappingQueue: DispatchQueue(label: "com.app.session.rootQueue", qos: .default)) } /// Convenient method to create ApiRequestParameters. From 2f8c5aa7b31a2783e254c6131764be0dc9c8c9fa Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 4 Sep 2020 18:54:43 +0300 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c56b9d..95b7505d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### 0.10.3 +- **Fix**: `mappingQueue` of `SessionManager`. + ### 0.10.2 - **Add**: `RefreshControl` - a basic UIRefreshControl with fixed refresh action. From 4ba7e639e8f31938a485163959f392bc52eef1fb Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 4 Sep 2020 19:02:08 +0300 Subject: [PATCH 3/5] Fix naming --- .../Structures/NetworkService/NetworkServiceConfiguration.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift index ab5a7094..70f355c8 100644 --- a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift +++ b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift @@ -72,7 +72,7 @@ public extension NetworkServiceConfiguration { serverTrustManager: ServerTrustManager(allHostsMustBeEvaluated: !serverTrustPolicies.isEmpty, evaluators: serverTrustPolicies), acceptableStatusCodes: acceptableStatusCodes, - mappingQueue: DispatchQueue(label: "com.app.session.rootQueue", qos: .default)) + mappingQueue: DispatchQueue(label: "leadkit.session.rootQueue", qos: .default)) } /// Convenient method to create ApiRequestParameters. From bd8542fe859570607cbe16c36270e747b14d1f8e Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 4 Sep 2020 19:05:13 +0300 Subject: [PATCH 4/5] Code correction --- .../NetworkService/NetworkServiceConfiguration.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift index 70f355c8..fb34f3f5 100644 --- a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift +++ b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift @@ -72,7 +72,7 @@ public extension NetworkServiceConfiguration { serverTrustManager: ServerTrustManager(allHostsMustBeEvaluated: !serverTrustPolicies.isEmpty, evaluators: serverTrustPolicies), acceptableStatusCodes: acceptableStatusCodes, - mappingQueue: DispatchQueue(label: "leadkit.session.rootQueue", qos: .default)) + mappingQueue: DispatchQueue(label: .mappingQueueLabel, qos: .default)) } /// Convenient method to create ApiRequestParameters. @@ -123,3 +123,7 @@ public extension NetworkServiceConfiguration { headers: requestHeaders) } } + +private extension String { + static let mappingQueueLabel = "leadkit.session.rootQueue" +} From 6c75bbe884a9488da66f8bbad71dfcd4adc2271c Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 4 Sep 2020 19:19:25 +0300 Subject: [PATCH 5/5] Remove custom requestQueue and serializationQueue --- Sources/Classes/Services/SessionManager.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Sources/Classes/Services/SessionManager.swift b/Sources/Classes/Services/SessionManager.swift index b212b2a7..9a1ed574 100644 --- a/Sources/Classes/Services/SessionManager.swift +++ b/Sources/Classes/Services/SessionManager.swift @@ -55,8 +55,6 @@ open class SessionManager: Alamofire.Session { super.init(session: session, delegate: delegate, rootQueue: mappingQueue, - requestQueue: .global(), - serializationQueue: .global(), serverTrustManager: serverTrustManager) } @@ -74,8 +72,6 @@ open class SessionManager: Alamofire.Session { super.init(session: session, delegate: delegate, rootQueue: mappingQueue, - requestQueue: .global(), - serializationQueue: .global(), serverTrustManager: serverTrustManager) } }