Swift5 update

.gitignore

@@ -1 +1,18 @@
-/Pods
+### Xcode ###
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.xcuserstate
+
+### Pods ###
+Pods/

KiwiPods.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "KiwiPods"
-  s.version      = "0.0.4"
+  s.version      = "0.0.8"
   s.summary      = "Summary"
 
   # This description is used to generate tags and improve search results.

KiwiPods.xcodeproj/project.pbxproj

@@ -250,6 +250,7 @@
 				TargetAttributes = {
 					D6B0315B2189D172003431C6 = {
 						CreatedOnToolsVersion = 10.0;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -259,6 +260,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = D6B031522189D172003431C6;
 			productRefGroup = D6B0315D2189D172003431C6 /* Products */;
@@ -489,7 +491,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Kiwitech.KiwiPods;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -515,7 +517,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Kiwitech.KiwiPods;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

KiwiPods/ImagePicker/ImagePickerController.swift

@@ -294,7 +294,7 @@ extension ImagePickerController: UICollectionViewDataSource {
     }
 }
 extension ImagePickerController: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+    public func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
         guard indexPath.row < imageAryCount else {
             return false
         }
@@ -304,7 +304,7 @@ extension ImagePickerController: UICollectionViewDelegate {
         delegate?.imagePicker(picker: self, failedWithError: .maxItemSelectionLimitExceeded)
         return false
     }
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+    public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
 
     }
 }
@@ -331,7 +331,7 @@ fileprivate extension ImagePickerController {
     }
 }
 extension ImagePickerController: UICollectionViewDelegateFlowLayout {
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+    public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         if indexPath.row < imageAryCount {
             return CGSize(width: (UIScreen.main.bounds.width/3)-3, height: (UIScreen.main.bounds.width/3)-3)
         } else {
@@ -340,7 +340,7 @@ extension ImagePickerController: UICollectionViewDelegateFlowLayout {
     }
 }
 extension ImagePickerController: UIScrollViewDelegate {
-    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
         let fiftyPercent = (scrollView.contentSize.height*50) / 100.0
         if scrollView.bounds.maxY > fiftyPercent {
             if type == .facebook {

KiwiPods/Networking/NetworkModel.swift

@@ -48,18 +48,23 @@ public protocol APIConfigurable: URLRequestConvertible {
 }
 
 public extension APIConfigurable {
-    public func asURLRequest() throws -> URLRequest {
-        var queryItems = ""
+    func asURLRequest() throws -> URLRequest {
         let hasUrlEncodedParams = (type == .GET || type == .DELETE || type == .HEAD)
-        if hasUrlEncodedParams, parameters.count > 0 {
-            queryItems = parameters.reduce("?") { (value: String, arg1: (String, Any)) -> String in
-                return value + "\(arg1.0)=\(arg1.1)&"
-            }
-            queryItems.removeLast()
-        }
-        let url = URL(string: (path + queryItems))
+//        if hasUrlEncodedParams, parameters.count > 0 {
+//            queryItems = parameters.reduce("?") { (value: String, arg1: (String, Any)) -> String in
+//                return value + "\(arg1.0)=\(arg1.1)&"
+//            }
+//            queryItems.removeLast()
+//        }
+        let url = URL(string: path)
         do {
             var urlRequest = try URLRequest(url: url!, method: type.httpMethod)
+            if hasUrlEncodedParams {
+                let encoding = URLEncoding()
+                urlRequest = try encoding.encode(urlRequest, with: parameters)
+            } else {
+                urlRequest.httpBody = try JSONSerialization.data(withJSONObject: parameters, options: JSONSerialization.WritingOptions.prettyPrinted)
+            }
             var apiHeaders = self.headers
             //check if `Content-Type` is provided
             // if `Content-Type` are not provided then add `application/json` as default
@@ -72,9 +77,6 @@ public extension APIConfigurable {
                 apiHeaders?["Content-Type"] = "application/json"
             }
             urlRequest.allHTTPHeaderFields = apiHeaders
-            if !hasUrlEncodedParams {
-                urlRequest.httpBody = try JSONSerialization.data(withJSONObject: parameters, options: JSONSerialization.WritingOptions.prettyPrinted)
-            }
             return urlRequest
         } catch {
             throw error
@@ -141,6 +143,10 @@ public enum Response<ResponseType> where ResponseType: ParameterConvertible {
     public struct ResponseValue {
         public let value: ResponseType
         public let statusCode: Int?
+        public init(value: ResponseType, statusCode: Int?) {
+            self.value = value
+            self.statusCode = statusCode
+        }
     }
     case success(ResponseValue),
     failed(ResponseError)

KiwiPods/Social/Facebook/FacebookHandler.swift

@@ -31,8 +31,10 @@ open class FacebookHandler: NSObject {
             }
         }
     }
-    public func getFacebookUserInfo(controller: UIViewController, completion: @escaping (_ result: FaceBookLoginData?, _ error: Error?) -> Void) {
-//        FacebookLoginHelper().getUserInfo(requestData: <#T##[String]#>, completion: <#T##(FaceBookLoginData?, Error?) -> Void#>)
+    public func getFacebookUserInfo(controller: UIViewController, completion: @escaping (_ email: String?, _ error: Error?) -> Void) {
+        FacebookLoginHelper().getUserInfo(requestData: ["email"]) { (result, error) in
+            completion(result?.email, error)
+        }
     }
     fileprivate static var imageUrls = [String: String]()
     fileprivate static var queuedUrls = [String]()

KiwiPods/Social/Google/GoogleHandler.swift

@@ -26,7 +26,7 @@ open class GoogleHandler: NSObject {
         } else {
             loginCompletion = completion
             loginHandlerController = controller
-            GIDSignIn.sharedInstance()?.uiDelegate = self
+            GIDSignIn.sharedInstance()?.delegate = self
             GIDSignIn.sharedInstance()?.signIn()
         }
     }
@@ -40,7 +40,7 @@ extension GoogleHandler: GIDSignInDelegate {
         loginCompletion?(user.authentication.idToken, nil)
     }
 }
-extension GoogleHandler: GIDSignInUIDelegate {
+extension GoogleHandler {
     public func sign(_ signIn: GIDSignIn!, present viewController: UIViewController!) {
         guard let controller = loginHandlerController else {
             return

Podfile

@@ -5,9 +5,9 @@ target 'KiwiPods' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
   use_frameworks!
   pod 'Alamofire', '~> 4.7'
-  pod 'FBSDKLoginKit', '~> 5.0.0'
-  pod 'FBSDKShareKit', '~> 5.0.0'
-  pod 'SDWebImage', '~> 5.0'
+  pod 'FBSDKLoginKit', '5.0.0'
+  pod 'FBSDKShareKit', '5.0.0'
+  pod 'SDWebImage', '5.0'
   pod 'TwitterKit'
   pod 'MBProgressHUD'
   pod 'GoogleSignIn'