diff --git a/Cartfile.resolved b/Cartfile.resolved index a22b45ff..f7e0cae1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/Alamofire/Alamofire.json" "4.8.1" binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxAlamofire/RxAlamofire.json" "4.3.0" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json" "4.4.2" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json" "6.0.1" +binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json" "4.5.0" +binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json" "6.0.3" binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/TableKit/TableKit.json" "2.10008.1" binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json" "1.1.0" diff --git a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift index a74d00e7..c0e7d983 100644 --- a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift +++ b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift @@ -22,9 +22,10 @@ import RxSwift +//swiftlint:disable all + /// Data loading model for PaginationDataLoadingState with ResettableRxDataSourceCursor as data source. -public final class PaginationDataLoadingModel: - RxDataLoadingModel> { +public final class PaginationDataLoadingModel: RxDataLoadingModel> { private enum LoadType { diff --git a/Sources/Classes/Search/BaseSearchViewController.swift b/Sources/Classes/Search/BaseSearchViewController.swift index 2e170cc1..ce84d686 100644 --- a/Sources/Classes/Search/BaseSearchViewController.swift +++ b/Sources/Classes/Search/BaseSearchViewController.swift @@ -27,7 +27,7 @@ import UIKit public typealias SearchResultsController = UIViewController & SearchResultsViewController /// Class that allows to enter text for search and then displays search results in table view -open class BaseSearchViewController: BaseCustomViewController diff --git a/Sources/Extensions/Alamofire/DataRequest+Extensions.swift b/Sources/Extensions/Alamofire/DataRequest+Extensions.swift index 78177d07..22fdd5c7 100644 --- a/Sources/Extensions/Alamofire/DataRequest+Extensions.swift +++ b/Sources/Extensions/Alamofire/DataRequest+Extensions.swift @@ -86,7 +86,6 @@ public extension ObservableType where E == DataRequest { } } - private extension ObservableType where E == ServerResponse { func tryMapResult(_ transform: @escaping (E) throws -> R) -> Observable { @@ -137,7 +136,7 @@ private extension ObservableType { switch afError { case .responseSerializationFailed, .responseValidationFailed: resultError = .invalidResponse(error: afError, response: response) - + default: resultError = .network(error: afError, response: response) } diff --git a/Sources/Structures/Api/ApiUploadRequestParameters.swift b/Sources/Structures/Api/ApiUploadRequestParameters.swift index 7f6b3628..3ef4bb3f 100644 --- a/Sources/Structures/Api/ApiUploadRequestParameters.swift +++ b/Sources/Structures/Api/ApiUploadRequestParameters.swift @@ -35,7 +35,6 @@ enum UploadParametersError: Error { case unableGetMimeType } - /// Struct which keeps base parameters required for upload api request public struct ApiUploadRequestParameters { @@ -90,7 +89,7 @@ private extension ApiUploadRequestParameters { var requestHeaders = headers let boundary = "\(Constants.boundaryKey)=\(formData.boundary)" - + requestHeaders[Constants.contentTypeKey] = Constants.contentTypeValue + boundary return requestHeaders