diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/ApiResponse.swift b/LeadKitAdditions/LeadKitAdditions/Classes/ApiResponse.swift index 0ae972d..bb1f92b 100644 --- a/LeadKitAdditions/LeadKitAdditions/Classes/ApiResponse.swift +++ b/LeadKitAdditions/LeadKitAdditions/Classes/ApiResponse.swift @@ -40,5 +40,5 @@ public protocol ApiResponseProtocol: ImmutableMappable { var errorCode: Int { get } var errorMessage: String? { get } - + } diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift index 0704e8d..a72cbbc 100644 --- a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift +++ b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift @@ -105,5 +105,5 @@ open class BaseDateFormatter { } }) } - + } diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/DefaultNetworkService.swift b/LeadKitAdditions/LeadKitAdditions/Classes/DefaultNetworkService.swift index b6f4e10..c35ad7a 100644 --- a/LeadKitAdditions/LeadKitAdditions/Classes/DefaultNetworkService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Classes/DefaultNetworkService.swift @@ -62,35 +62,35 @@ open class DefaultNetworkService: NetworkService { // MARK: - Internal methods - func request(with parameters: ApiRequestParameters) -> Observable { - let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)> - - return apiResponseRequest - .handleConnectionErrors() - .map { - if $0.model.errorCode == 0 { - return try T(JSON: try cast($0.model.result) as [String: Any]) - } else { - throw ApiError(apiResponse: $0.model) - } - } - .handleGeneralApiErrors() - } - - func requestForResult(with parameters: ApiRequestParameters) -> Observable { - let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)> - - return apiResponseRequest - .handleConnectionErrors() - .map { - if $0.model.errorCode == 0 { - return true - } else { - throw ApiError(apiResponse: $0.model) - } - } - .handleGeneralApiErrors() - } +// func request(with parameters: ApiRequestParameters) -> Observable { +// let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)> +// +// return apiResponseRequest +// .handleConnectionErrors() +// .map { +// if $0.model.errorCode == 0 { +// return try T(JSON: try cast($0.model.result) as [String: Any]) +// } else { +// throw ApiError(apiResponse: $0.model) +// } +// } +// .handleGeneralApiErrors() +// } +// +// func requestForResult(with parameters: ApiRequestParameters) -> Observable { +// let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)> +// +// return apiResponseRequest +// .handleConnectionErrors() +// .map { +// if $0.model.errorCode == 0 { +// return true +// } else { +// throw ApiError(apiResponse: $0.model) +// } +// } +// .handleGeneralApiErrors() +// } } @@ -98,11 +98,11 @@ extension ApiRequestParameters { init(url: String, parameters: [String: Any] = [:]) { - self.init(url: URLSessionConfiguration.baseUrl() + url, + self.init(url: DefaultNetworkService.baseUrl() + url, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: nil) } - + } diff --git a/LeadKitAdditions/LeadKitAdditions/Enums/ApiError.swift b/LeadKitAdditions/LeadKitAdditions/Enums/ApiError.swift index 27e7559..1aadac7 100644 --- a/LeadKitAdditions/LeadKitAdditions/Enums/ApiError.swift +++ b/LeadKitAdditions/LeadKitAdditions/Enums/ApiError.swift @@ -26,7 +26,7 @@ public enum ApiError: Error { case error(code: Int, message: String) case none - + } extension ApiError: LocalizedError { @@ -47,5 +47,5 @@ extension ApiError: LocalizedError { return nil } } - + } diff --git a/LeadKitAdditions/LeadKitAdditions/Enums/ConnectionError.swift b/LeadKitAdditions/LeadKitAdditions/Enums/ConnectionError.swift index 3f7de53..dc49437 100644 --- a/LeadKitAdditions/LeadKitAdditions/Enums/ConnectionError.swift +++ b/LeadKitAdditions/LeadKitAdditions/Enums/ConnectionError.swift @@ -25,5 +25,5 @@ import Foundation enum ConnectionError: LocalizedError { case noConnection - + } diff --git a/LeadKitAdditions/LeadKitAdditions/Extensions/Observable+Extensions.swift b/LeadKitAdditions/LeadKitAdditions/Extensions/Observable+Extensions.swift index fe36e5e..3aa0e7a 100644 --- a/LeadKitAdditions/LeadKitAdditions/Extensions/Observable+Extensions.swift +++ b/LeadKitAdditions/LeadKitAdditions/Extensions/Observable+Extensions.swift @@ -53,7 +53,7 @@ public extension Observable { } public func retryWithinErrors(_ errorTypes: [Error.Type] = [ConnectionError.self], - retryLimit: Int = SberCardsNetworkService.retryLimit) + retryLimit: Int = DefaultNetworkService.retryLimit) -> Observable { return observeOn(CurrentThreadScheduler.instance) diff --git a/LeadKitAdditions/LeadKitAdditions/Extensions/UserDefaults+UserService.swift b/LeadKitAdditions/LeadKitAdditions/Extensions/UserDefaults+UserService.swift index 15ac6c2..eb6e8f3 100644 --- a/LeadKitAdditions/LeadKitAdditions/Extensions/UserDefaults+UserService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Extensions/UserDefaults+UserService.swift @@ -46,5 +46,5 @@ public extension UserDefaults { set(newValue, forKey: Keys.userLogin) } } - + } diff --git a/LeadKitAdditions/Podfile b/LeadKitAdditions/Podfile index eac08a6..2629275 100644 --- a/LeadKitAdditions/Podfile +++ b/LeadKitAdditions/Podfile @@ -6,14 +6,8 @@ platform :ios, '9.0' target 'LeadKitAdditions' do use_frameworks! - pod "CocoaLumberjack/Swift", '~> 3.1.0' - pod "RxSwift", '3.2.0' - pod "RxCocoa", '3.2.0' - pod "RxAlamofire", '3.0.0' - pod "ObjectMapper", '~> 2.1' - pod "Toast-Swift", '~> 2.0.0' - pod "LeadKit" - pod "TableKit" + pod 'LeadKit', :git => 'https://github.com/TouchInstinct/LeadKit.git', :branch => 'fix/sharedApplication', :commit => 'fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7' + pod 'TableKit' end diff --git a/LeadKitAdditions/Podfile.lock b/LeadKitAdditions/Podfile.lock index 5861e9e..c0e2948 100644 --- a/LeadKitAdditions/Podfile.lock +++ b/LeadKitAdditions/Podfile.lock @@ -23,19 +23,24 @@ PODS: - Toast-Swift (2.0.0) DEPENDENCIES: - - CocoaLumberjack/Swift (~> 3.1.0) - - LeadKit - - ObjectMapper (~> 2.1) - - RxAlamofire (= 3.0.0) - - RxCocoa (= 3.2.0) - - RxSwift (= 3.2.0) + - LeadKit (from `https://github.com/TouchInstinct/LeadKit.git`, commit `fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7`, branch `fix/sharedApplication`) - TableKit - - Toast-Swift (~> 2.0.0) + +EXTERNAL SOURCES: + LeadKit: + :branch: fix/sharedApplication + :commit: fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7 + :git: https://github.com/TouchInstinct/LeadKit.git + +CHECKOUT OPTIONS: + LeadKit: + :commit: fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7 + :git: https://github.com/TouchInstinct/LeadKit.git SPEC CHECKSUMS: Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d CocoaLumberjack: 8311463ddf9ee86a06ef92a071dd656c89244500 - LeadKit: 00f7b16febbed12d29b05c14bd8b5ba4fb9c01ac + LeadKit: d688a8bef79de7bbd83d553da3cb6c5292d48f2d ObjectMapper: fb30f71e08470d1e5a20b199fafe1246281db898 RxAlamofire: 0b1fa48f545fffe7f7a28af2086bcaa3b5946cc9 RxCocoa: ccdf43101a70407097a29082f648ba1676075b30 @@ -43,6 +48,6 @@ SPEC CHECKSUMS: TableKit: 02e041b443f75fa3e9f1ee6024d4b256305bd904 Toast-Swift: 5b2f8f720f7e78e48511f693df1f9c9a6e38a25a -PODFILE CHECKSUM: 29a03af2241e08742796fb1812bb8d084f03bafe +PODFILE CHECKSUM: ce4fe179e6470b751617d19baacbce25502a7002 COCOAPODS: 1.2.0