Merge 195d990 into 90c7f12

railwaymen · Aug 14, 2020 · 03b48dd · 03b48dd
2 parents 90c7f12 + 195d990
commit 03b48dd
Show file tree

Hide file tree

Showing 51 changed files with 52 additions and 53 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,10 @@
 // swift-tools-version:5.1
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
 import PackageDescription
 
 let package = Package(
     name: "Restler",
     platforms: [
-        .iOS(.v11),
+        .iOS(.v10),
         .macOS(.v10_15)
     ],
     products: [

diff --git a/Restler-Example/Restler-Example/AppDelegate.swift b/Restler-Example/Restler-Example/AppDelegate.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
+final class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         return true

diff --git a/Restler-Example/Restler-Example/SceneDelegate.swift b/Restler-Example/Restler-Example/SceneDelegate.swift
@@ -9,7 +9,7 @@
 import UIKit
 import SwiftUI
 
-class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
 

diff --git a/Restler-Example/Restler-Example/Source/Comment/CommentViewModel.swift b/Restler-Example/Restler-Example/Source/Comment/CommentViewModel.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import Combine
 import Restler
 
-class CommentViewModel: ObservableObject {
+final class CommentViewModel: ObservableObject {
     private let restler = Restler(baseURL: URL(string: "https://jsonplaceholder.typicode.com")!)
     private let comment: PostComment
     private var tasks: Set<Restler.Task> = []

diff --git a/Restler-Example/Restler-Example/Source/List/ContentViewModel.swift b/Restler-Example/Restler-Example/Source/List/ContentViewModel.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import Combine
 import Restler
 
-class ContentViewModel: ObservableObject {
+final class ContentViewModel: ObservableObject {
     private let restler = Restler(baseURL: URL(string: "https://jsonplaceholder.typicode.com")!)
 
     private var subscriptions: [AnyCancellable] = []

diff --git a/Restler-Example/Restler-Example/Source/Post/PostViewModel.swift b/Restler-Example/Restler-Example/Source/Post/PostViewModel.swift
@@ -10,7 +10,7 @@ import Foundation
 import Combine
 import Restler
 
-class PostViewModel: ObservableObject {
+final class PostViewModel: ObservableObject {
     private let restler = Restler(baseURL: URL(string: "https://jsonplaceholder.typicode.com")!)
 
     let objectWillChange = PassthroughSubject<Void, Never>()

diff --git a/Sources/Restler/Internal/DispatchQueueManager.swift b/Sources/Restler/Internal/DispatchQueueManager.swift
@@ -4,7 +4,7 @@ protocol DispatchQueueManagerType: class {
     func perform(on thread: DispatchQueueThread, _ syncType: DispatchQueueSynchronizationType, action: @escaping () -> Void)
 }
 
-class DispatchQueueManager: DispatchQueueManagerType {
+final class DispatchQueueManager: DispatchQueueManagerType {
     func perform(on thread: DispatchQueueThread, _ synchType: DispatchQueueSynchronizationType, action: @escaping () -> Void) {
         switch synchType {
         case .async: thread.queue.async(execute: action)

diff --git a/Sources/Restler/Internal/Extensions/JSONSerializationType+Extension.swift b/Sources/Restler/Internal/Extensions/JSONSerializationType+Extension.swift
@@ -4,7 +4,7 @@ protocol JSONSerializationType: class {
     func jsonObject(with data: Data, options opt: JSONSerialization.ReadingOptions) throws -> Any
 }
 
-class CustomJSONSerialization: JSONSerializationType {
+final class CustomJSONSerialization: JSONSerializationType {
     func jsonObject(with data: Data, options: JSONSerialization.ReadingOptions) throws -> Any {
         return try JSONSerialization.jsonObject(with: data, options: options)
     }

diff --git a/Sources/Restler/Internal/Networking.swift b/Sources/Restler/Internal/Networking.swift
@@ -21,7 +21,7 @@ protocol NetworkingType: class {
     ) -> URLSession.DataTaskPublisher?
 }
 
-class Networking {
+final class Networking {
     private let session: URLSessionType
 
     // MARK: - Initialization

diff --git a/Sources/Restler/Public/Classes/MultipartEncoder/MultipartEncoder.swift b/Sources/Restler/Public/Classes/MultipartEncoder/MultipartEncoder.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler {
-    public class MultipartEncoder: RestlerMultipartEncoderType {
+    public final class MultipartEncoder: RestlerMultipartEncoderType {
         internal static let lineBreak = "\r\n"
 
         private var containers: [RestlerMultipartSectionsType] = []

diff --git a/Sources/Restler/Public/Classes/MultipartEncoder/MultipartEncoderContainer.swift b/Sources/Restler/Public/Classes/MultipartEncoder/MultipartEncoderContainer.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler.MultipartEncoder {
-    public class Container<Key: CodingKey>: RestlerMultipartContainerType {
+    public final class Container<Key: CodingKey>: RestlerMultipartContainerType {
         internal var sections: [Restler.MultipartSection] = []
 
         // MARK: - Public

diff --git a/Sources/Restler/Public/Classes/QueryEncoder/QueryEncoder.swift b/Sources/Restler/Public/Classes/QueryEncoder/QueryEncoder.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler {
-    public class QueryEncoder: RestlerQueryEncoderType {
+    public final class QueryEncoder: RestlerQueryEncoderType {
         private let jsonEncoder: RestlerJSONEncoderType
 
         private var containers: [QueryItemsRepresentable] = []

diff --git a/Sources/Restler/Public/Classes/QueryEncoder/QueryEncoderKeyedContainer.swift b/Sources/Restler/Public/Classes/QueryEncoder/QueryEncoderKeyedContainer.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler.QueryEncoder {
-    public class KeyedContainer<Key: CodingKey>: RestlerQueryEncoderContainerType {
+    public final class KeyedContainer<Key: CodingKey>: RestlerQueryEncoderContainerType {
         private let jsonEncoder: RestlerJSONEncoderType
 
         internal var tuples: [(key: String, value: String)] = []

diff --git a/Sources/Restler/Public/Classes/QueryEncoder/QueryEncoderStringKeyedContainer.swift b/Sources/Restler/Public/Classes/QueryEncoder/QueryEncoderStringKeyedContainer.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler.QueryEncoder {
-    public class StringKeyedContainer: RestlerQueryEncoderContainerType {
+    public final class StringKeyedContainer: RestlerQueryEncoderContainerType {
         // swiftlint:disable:next nesting
         public typealias Key = String
 

diff --git a/Sources/Restler/Public/Classes/Request/DecodableRequest.swift b/Sources/Restler/Public/Classes/Request/DecodableRequest.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler {
-    public class DecodableRequest<D: Decodable>: Request<D>, RestlerRequestInternal {
+    public final class DecodableRequest<D: Decodable>: Request<D>, RestlerRequestInternal {
         internal let dependencies: Restler.RequestDependencies
 
         private var successCompletionHandler: ((D) -> Void)?

diff --git a/Sources/Restler/Public/Classes/Request/OptionalDecodableRequest.swift b/Sources/Restler/Public/Classes/Request/OptionalDecodableRequest.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler {
-    public class OptionalDecodableRequest<D: Decodable>: Request<D?>, RestlerRequestInternal {
+    public final class OptionalDecodableRequest<D: Decodable>: Request<D?>, RestlerRequestInternal {
         internal let dependencies: Restler.RequestDependencies
 
         private var successCompletionHandler: ((D?) -> Void)?

diff --git a/Sources/Restler/Public/Classes/Request/RequestBuilder.swift b/Sources/Restler/Public/Classes/Request/RequestBuilder.swift
@@ -3,7 +3,7 @@ import Foundation
 typealias QueryParametersType = [URLQueryItem]
 
 extension Restler {
-    public class RequestBuilder {
+    public final class RequestBuilder {
         private let dependencies: Dependencies
         private var form: Form
 

diff --git a/Sources/Restler/Public/Classes/Request/VoidRequest.swift b/Sources/Restler/Public/Classes/Request/VoidRequest.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension Restler {
-    public class VoidRequest: Request<Void>, RestlerRequestInternal {
+    public final class VoidRequest: Request<Void>, RestlerRequestInternal {
         internal let dependencies: Restler.RequestDependencies
 
         private var successCompletionHandler: ((SuccessfulResponseObject) -> Void)?

diff --git a/Tests/RestlerTests/Common/TestError.swift b/Tests/RestlerTests/Common/TestError.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-class TestError: Error {}
+final class TestError: Error {}
 
 // MARK: - Equatable
 extension TestError: Equatable {

diff --git a/Tests/RestlerTests/Common/ThrowingObject.swift b/Tests/RestlerTests/Common/ThrowingObject.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Restler
 
-class ThrowingObject: Codable, RestlerQueryEncodable, RestlerMultipartEncodable {
+final class ThrowingObject: Codable, RestlerQueryEncodable, RestlerMultipartEncodable {
     var thrownError: Error = TestError()
 
     init() {}

diff --git a/Tests/RestlerTests/Mocks/CustomJSONSerializationMock.swift b/Tests/RestlerTests/Mocks/CustomJSONSerializationMock.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class CustomJSONSerializationMock {
+final class CustomJSONSerializationMock {
 
     // MARK: - JSONSerializationType
     var jsonObjectThrownError: Error?

diff --git a/Tests/RestlerTests/Mocks/DispatchQueueManagerMock.swift b/Tests/RestlerTests/Mocks/DispatchQueueManagerMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class DispatchQueueManagerMock {
+final class DispatchQueueManagerMock {
 
     // MARK: - DispatchQueueManagerType
     private(set) var performParams: [PerformParams] = []

diff --git a/Tests/RestlerTests/Mocks/Errors/DecodableErrorMock.swift b/Tests/RestlerTests/Mocks/Errors/DecodableErrorMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class DecodableErrorMock: RestlerErrorDecodable {
+final class DecodableErrorMock: RestlerErrorDecodable {
     required init?(response _: Restler.Response) {}
 }
 
diff --git a/Tests/RestlerTests/Mocks/Errors/UndecodableErrorMock.swift b/Tests/RestlerTests/Mocks/Errors/UndecodableErrorMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class UndecodableErrorMock: RestlerErrorDecodable {
+final class UndecodableErrorMock: RestlerErrorDecodable {
     required init?(response _: Restler.Response) {
         return nil
     }

diff --git a/Tests/RestlerTests/Mocks/HTTPURLResponseMock.swift b/Tests/RestlerTests/Mocks/HTTPURLResponseMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class HTTPURLResponseMock {
+final class HTTPURLResponseMock {
 
     // MARK: - HTTPURLResponseType
     var isSuccessfulReturnValue: Bool = true

diff --git a/Tests/RestlerTests/Mocks/JSONEncoderThrowingMock.swift b/Tests/RestlerTests/Mocks/JSONEncoderThrowingMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class JSONEncoderThrowingMock: RestlerJSONEncoderType {
+final class JSONEncoderThrowingMock: RestlerJSONEncoderType {
     var thrownError = TestError()
 
     func encode<T>(_ value: T) throws -> Data where T: Encodable {

diff --git a/Tests/RestlerTests/Mocks/NetworkingMock.swift b/Tests/RestlerTests/Mocks/NetworkingMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class NetworkingMock {
+final class NetworkingMock {
 
     // MARK: - NetworkingType
     var makeRequestReturnValue: Restler.Task?

diff --git a/Tests/RestlerTests/Mocks/Public/RestlerErrorParserMock.swift b/Tests/RestlerTests/Mocks/Public/RestlerErrorParserMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Restler
 
-class RestlerErrorParserMock {
+final class RestlerErrorParserMock {
 
     // MARK: - RestlerErrorParserType
     var decodingErrorsReturnValue: [RestlerErrorDecodable.Type] = []

diff --git a/Tests/RestlerTests/Mocks/Public/RestlerMock.swift b/Tests/RestlerTests/Mocks/Public/RestlerMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Restler
 
-class RestlerMock {
+final class RestlerMock {
     var encoder: RestlerJSONEncoderType = JSONEncoder()
 
     var decoder: RestlerJSONDecoderType = JSONDecoder()

diff --git a/Tests/RestlerTests/Mocks/Public/RestlerRequestBuilderMock.swift b/Tests/RestlerTests/Mocks/Public/RestlerRequestBuilderMock.swift
@@ -1,7 +1,7 @@
 import XCTest
 import Restler
 
-class RestlerRequestBuilderMock {
+final class RestlerRequestBuilderMock {
 
     // MARK: - RestlerBasicRequestBuilderType
     private(set) var setInHeaderParams: [SetInHeaderParams] = []

diff --git a/Tests/RestlerTests/Mocks/Public/RestlerRequestMock.swift b/Tests/RestlerTests/Mocks/Public/RestlerRequestMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Restler
 
-class RestlerRequestMock<T>: Restler.Request<T> {
+final class RestlerRequestMock<T>: Restler.Request<T> {
 
     private(set) var onSuccessParams: [OnSuccessParams] = []
     struct OnSuccessParams {

diff --git a/Tests/RestlerTests/Mocks/URLSessionDataTaskMock.swift b/Tests/RestlerTests/Mocks/URLSessionDataTaskMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class URLSessionDataTaskMock {
+final class URLSessionDataTaskMock {
 
     // MARK: - URLSessionDataTaskType
     var taskIdentifierReturnValue: Int = 0

diff --git a/Tests/RestlerTests/Mocks/URLSessionMock.swift b/Tests/RestlerTests/Mocks/URLSessionMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 @testable import Restler
 
-class URLSessionMock {
+final class URLSessionMock {
 
     // MARK: - URLSessionType
     var dataTaskReturnValue: URLSessionDataTaskMock = URLSessionDataTaskMock()
@@ -24,6 +24,7 @@ extension URLSessionMock: URLSessionType {
         return self.dataTaskReturnValue
     }
 
+    @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
     func dataTaskPublisher(for request: URLRequest) -> URLSession.DataTaskPublisher {
         self.dataTaskPublisherParams.append(DataTaskPublisherParams(request: request))
         return URLSession.shared.dataTaskPublisher(for: request)

diff --git a/Tests/RestlerTests/Tests/Integration/DeleteInterfaceIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/DeleteInterfaceIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class DeleteInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
+final class DeleteInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
 
 // MARK: - Void response
 extension DeleteInterfaceIntegrationTests {

diff --git a/Tests/RestlerTests/Tests/Integration/GetInterfaceIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/GetInterfaceIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class GetInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
+final class GetInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
 
 // MARK: - Void response
 extension GetInterfaceIntegrationTests {

diff --git a/Tests/RestlerTests/Tests/Integration/HeadInterfaceIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/HeadInterfaceIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class HeadInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
+final class HeadInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
 
 // MARK: - Void response
 extension HeadInterfaceIntegrationTests {

diff --git a/Tests/RestlerTests/Tests/Integration/PatchInterfaceIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/PatchInterfaceIntegrationTests.swift
@@ -8,7 +8,7 @@
 import XCTest
 @testable import Restler
 
-class PatchInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
+final class PatchInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
 
 // MARK: - Void response
 extension PatchInterfaceIntegrationTests {

diff --git a/Tests/RestlerTests/Tests/Integration/PostInterfaceIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/PostInterfaceIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class PostInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
+final class PostInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
 
 // MARK: - Void response
 extension PostInterfaceIntegrationTests {

diff --git a/Tests/RestlerTests/Tests/Integration/PutInterfaceIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/PutInterfaceIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class PutInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
+final class PutInterfaceIntegrationTests: InterfaceIntegrationTestsBase {}
 
 // MARK: - Void response
 extension PutInterfaceIntegrationTests {

diff --git a/Tests/RestlerTests/Tests/Integration/QueryEncoderIntegrationTests.swift b/Tests/RestlerTests/Tests/Integration/QueryEncoderIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class QueryEncoderIntegrationTests: XCTestCase {}
+final class QueryEncoderIntegrationTests: XCTestCase {}
 
 extension QueryEncoderIntegrationTests {
     func testEncoding_stringDictionary() throws {

diff --git a/Tests/RestlerTests/Tests/RestlerInterfaceMocksTests.swift b/Tests/RestlerTests/Tests/RestlerInterfaceMocksTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 import Restler
 
-class RestlerInterfaceMocksTests: XCTestCase {
+final class RestlerInterfaceMocksTests: XCTestCase {
     private var restler: RestlerMock!
 
     override func setUp() {

diff --git a/Tests/RestlerTests/Tests/Unit/ErrorParserTests.swift b/Tests/RestlerTests/Tests/Unit/ErrorParserTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class ErrorParserTests: XCTestCase {}
+final class ErrorParserTests: XCTestCase {}
 
 // MARK: - parse(_:)
 extension ErrorParserTests {

diff --git a/Tests/RestlerTests/Tests/Unit/ErrorTests.swift b/Tests/RestlerTests/Tests/Unit/ErrorTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Restler
 
-class ErrorTests: XCTestCase {}
+final class ErrorTests: XCTestCase {}
 
 // MARK: - Equatable
 extension ErrorTests {