Updated project for Swift 5. Extended header which now are also [Stri…

…ng: Any?]. Updated RxSwift.
sky-uk · Apr 18, 2019 · 5bc193d · 5bc193d
1 parent 70ad3ac
commit 5bc193d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "4.4.0"
+github "ReactiveX/RxSwift" "4.5.0"
diff --git a/ReactiveAPI.xcodeproj/project.pbxproj b/ReactiveAPI.xcodeproj/project.pbxproj
@@ -158,7 +158,7 @@
 				TargetAttributes = {
 					D195F1C722086C8200530339 = {
 						CreatedOnToolsVersion = 10.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -361,7 +361,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -391,7 +391,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = it.sky.ReactiveAPI;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/ReactiveAPI/Extensions/Encodable+Dictionary.swift b/ReactiveAPI/Extensions/Encodable+Dictionary.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public extension Encodable {
-    public var dictionary: [String: Any]? {
+    var dictionary: [String: Any]? {
         guard let data = try? JSONEncoder().encode(self) else { return nil }
         return (try? JSONSerialization.jsonObject(with: data, options: .allowFragments))
             .flatMap { $0 as? [String: Any] }

diff --git a/ReactiveAPI/Extensions/URLRequest+ReactiveAPI.swift b/ReactiveAPI/Extensions/URLRequest+ReactiveAPI.swift
@@ -38,7 +38,7 @@ extension URLRequest {
 
     public static func createForJSON(with url: URL,
                                      method: ReactiveAPIHTTPMethod = .get,
-                                     headers: [String: String?]? = nil,
+                                     headers: [String: Any?]? = nil,
                                      queryParams: [String: Any?]? = nil,
                                      body: Encodable? = nil) throws -> URLRequest {
         return try createForJSON(with: url,

diff --git a/ReactiveAPI/Info.plist b/ReactiveAPI/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/ReactiveAPI/JSONReactiveAPI.swift b/ReactiveAPI/JSONReactiveAPI.swift
@@ -94,11 +94,11 @@ open class JSONReactiveAPI: ReactiveAPI {
 
 public extension JSONReactiveAPI {
     // body params as dictionary and generic response type
-    public func request<D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
-                                      url: URL,
-                                      headers: [String: String?]? = nil,
-                                      queryParams: [String: Any?]? = nil,
-                                      bodyParams: [String: Any?]? = nil) -> Single<D> {
+    func request<D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
+                               url: URL,
+                               headers: [String: Any?]? = nil,
+                               queryParams: [String: Any?]? = nil,
+                               bodyParams: [String: Any?]? = nil) -> Single<D> {
         do {
             let request = try URLRequest.createForJSON(with: url,
                                                        method: method,
@@ -112,11 +112,11 @@ public extension JSONReactiveAPI {
     }
 
     // body params as encodable and generic response type
-    public func request<E: Encodable, D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
-                                                    url: URL,
-                                                    headers: [String: String?]? = nil,
-                                                    queryParams: [String: Any?]? = nil,
-                                                    body: E? = nil) -> Single<D> {
+    func request<E: Encodable, D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
+                                             url: URL,
+                                             headers: [String: Any?]? = nil,
+                                             queryParams: [String: Any?]? = nil,
+                                             body: E? = nil) -> Single<D> {
         do {
             let request = try URLRequest.createForJSON(with: url,
                                                        method: method,
@@ -130,11 +130,11 @@ public extension JSONReactiveAPI {
     }
 
     // body params as dictionary and void response type
-    public func request(_ method: ReactiveAPIHTTPMethod = .get,
-                        url: URL,
-                        headers: [String: String?]? = nil,
-                        queryParams: [String: Any?]? = nil,
-                        bodyParams: [String: Any?]? = nil) -> Single<Void> {
+    func request(_ method: ReactiveAPIHTTPMethod = .get,
+                 url: URL,
+                 headers: [String: Any?]? = nil,
+                 queryParams: [String: Any?]? = nil,
+                 bodyParams: [String: Any?]? = nil) -> Single<Void> {
         do {
             let request = try URLRequest.createForJSON(with: url,
                                                        method: method,
@@ -148,11 +148,11 @@ public extension JSONReactiveAPI {
     }
 
     // body params as encodable and void response type
-    public func request<E: Encodable>(_ method: ReactiveAPIHTTPMethod = .get,
-                                      url: URL,
-                                      headers: [String: String?]? = nil,
-                                      queryParams: [String: Any?]? = nil,
-                                      body: E? = nil) -> Single<Void> {
+    func request<E: Encodable>(_ method: ReactiveAPIHTTPMethod = .get,
+                               url: URL,
+                               headers: [String: Any?]? = nil,
+                               queryParams: [String: Any?]? = nil,
+                               body: E? = nil) -> Single<Void> {
         do {
             let request = try URLRequest.createForJSON(with: url,
                                                        method: method,
@@ -166,11 +166,11 @@ public extension JSONReactiveAPI {
     }
 
     // body params as dictionary and array response type
-    public func request<D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
-                                      url: URL,
-                                      headers: [String: String?]? = nil,
-                                      queryParams: [String: Any?]? = nil,
-                                      bodyParams: [String: Any?]? = nil) -> Single<[D]> {
+    func request<D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
+                               url: URL,
+                               headers: [String: Any?]? = nil,
+                               queryParams: [String: Any?]? = nil,
+                               bodyParams: [String: Any?]? = nil) -> Single<[D]> {
         do {
             let request = try URLRequest.createForJSON(with: url,
                                                        method: method,
@@ -184,11 +184,11 @@ public extension JSONReactiveAPI {
     }
 
     // body params as encodable and array response type
-    public func request<E: Encodable, D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
-                                                    url: URL,
-                                                    headers: [String: String?]? = nil,
-                                                    queryParams: [String: Any?]? = nil,
-                                                    body: E? = nil) -> Single<[D]> {
+    func request<E: Encodable, D: Decodable>(_ method: ReactiveAPIHTTPMethod = .get,
+                                             url: URL,
+                                             headers: [String: Any?]? = nil,
+                                             queryParams: [String: Any?]? = nil,
+                                             body: E? = nil) -> Single<[D]> {
         do {
             let request = try URLRequest.createForJSON(with: url,
                                                        method: method,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveX/RxSwift" "4.4.0"
		github "ReactiveX/RxSwift" "4.5.0"