Xcode 10 and Swift 4.2 support.

arturgrigor · arturgrigor · commit dcce01ce357b · 2018-09-14T12:13:52.000+03:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -12,11 +12,11 @@ env:
     - DESTINATION="OS=4.0,name=Apple Watch Series 3 - 42mm" RUN_TESTS="NO"  POD_LINT="NO"
     - DESTINATION="OS=2.0,name=Apple Watch - 42mm"          RUN_TESTS="NO"  POD_LINT="NO"
 
-    - DESTINATION="OS=11.0,name=iPhone 8 Plus"              RUN_TESTS="NO" POD_LINT="YES"
-    - DESTINATION="OS=9.0,name=iPad 2"                      RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="OS=12.0,name=iPhone 8 Plus"              RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPad 2"                      RUN_TESTS="NO"  POD_LINT="NO"
 
-    - DESTINATION="OS=11.0,name=Apple TV 1080p"             RUN_TESTS="NO" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=Apple TV 1080p"              RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="OS=12.0,name=Apple TV"                   RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=Apple TV 1080p"              RUN_TESTS="NO"  POD_LINT="NO"
 
     - DESTINATION="arch=x86_64"                             RUN_TESTS="YES" POD_LINT="NO"
 script:
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" "6.0.0"
+github "AliSoftware/OHHTTPStubs" "6.1.0"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
@@ -1 +1 @@
-Subproject commit f90c2bb0fb882e43761ab963ca8869d349d2c6e3
+Subproject commit c088cfa9b46fa9cafada8c008b63903f1b719486
diff --git a/IPAPI.podspec b/IPAPI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'IPAPI'
-  s.version = '1.2.0'
+  s.version = '1.3.0'
   s.license = 'MIT'
   s.summary = 'http://ip-api.com Geolocation API client written in Swift.'
   s.homepage = 'https://github.com/arturgrigor/IPAPI'
diff --git a/IPAPI.xcodeproj/project.pbxproj b/IPAPI.xcodeproj/project.pbxproj
@@ -122,6 +122,8 @@
 		FE576B221E0C99E5009D4C46 /* IPAPI Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "IPAPI Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		FE7C0C9B1E0CB16D00620172 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		FE7C0C9C1E0CB16D00620172 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		FE8BFBE5214BB255005205DB /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
+		FE8BFBE6214BB25B005205DB /* .swift-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".swift-version"; sourceTree = "<group>"; };
 		FE97616C1E8FBB52006F1F9D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		FE97616D1E8FBB52006F1F9D /* IPAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPAPI.h; sourceTree = "<group>"; };
 		FE97616E1E8FBB52006F1F9D /* Service.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Service.swift; sourceTree = "<group>"; };
@@ -230,6 +232,8 @@
 		FEE453F71E0BE8DB00D8E707 = {
 			isa = PBXGroup;
 			children = (
+				FE8BFBE5214BB255005205DB /* .travis.yml */,
+				FE8BFBE6214BB25B005205DB /* .swift-version */,
 				FEE4540C1E0BE96600D8E707 /* IPAPI.podspec */,
 				FE9761A21E8FBD45006F1F9D /* Package.swift */,
 				FE7C0C9B1E0CB16D00620172 /* LICENSE */,
@@ -328,7 +332,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Artur Grigor";
 				TargetAttributes = {
 					FE576B211E0C99E5009D4C46 = {
@@ -592,13 +596,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -636,7 +642,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -655,13 +661,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -691,7 +699,7 @@
 				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos watchsimulator iphonesimulator watchos iphoneos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/IPAPI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/IPAPI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/IPAPI.xcodeproj/xcshareddata/xcschemes/IPAPI.xcscheme b/IPAPI.xcodeproj/xcshareddata/xcschemes/IPAPI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Artur Grigor
+Copyright (c) 2016 - 2018 Artur Grigor
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ http://ip-api.com Geolocation API client written in Swift.
 ## Requirements
 
 - iOS 8.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+
-- Xcode 8.0+
-- Swift 4+
+- Xcode 10.0+
+- Swift 4.2+
 
 ## Installation
 
@@ -30,7 +30,7 @@ $ brew install carthage
 To integrate IPAPI into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
-github "arturgrigor/IPAPI" ~> 1.2
+github "arturgrigor/IPAPI" ~> 1.3
 ```
 
 Run `carthage update` to build the framework and drag the built `IPAPI.framework` into your Xcode project.
@@ -53,7 +53,7 @@ platform :ios, '10.0'
 use_frameworks!
 
 target '<Your Target Name>' do
-    pod 'IPAPI', '~> 1.2'
+    pod 'IPAPI', '~> 1.3'
 end
 ```
 
diff --git a/Sources/Service.swift b/Sources/Service.swift
@@ -6,10 +6,6 @@
 //  Copyright © 2016 Artur Grigor. All rights reserved.
 //
 
-//
-//  # Imports
-//
-
 import Foundation
 
 //
@@ -20,14 +16,12 @@ import Foundation
 ///
 /// Our system will automatically ban any IP addresses doing over 150 requests per minute. To unban your IP click [here](http://ip-api.com/docs/unban).
 /// You are free to use ip-api.com for non-commercial use. **We do not allow commercial use without prior approval**.
-open class Service
-{
+open class Service {
     
     // MARK: - Types -
     
     /// This is the error type returned by IPAPI.
-    public enum Error: Swift.Error
-    {
+    public enum Error: Swift.Error {
         /// Returned when the `URLComponents` structure fails to initialize, most likely because of the `query` parameter.
         case invalidURL
         /// Return when the `URLComponents` structure fails to create a valid `URL`.
@@ -39,17 +33,15 @@ open class Service
     }
     
     /// This is the status type returned by IPAPI.
-    public enum Status: String, Codable
-    {
+    public enum Status: String, Codable {
         /// Returned when the server is unable to process the request.
         case fail
         /// Returned when the request has succeeded.
         case success
     }
     
     /// This is the result type returned by IPAPI.
-    public struct Result: Codable
-    {
+    public struct Result: Codable {
         /// AS number and name, separated by space. Example: `"AS15169 Google Inc."`
         public var `as`: String?
         /// City. Example: `"Mountain View"`
@@ -138,8 +130,7 @@ open class Service
     }
     
     /// This is the request type used by the `batch` method.
-    public struct Request: Codable
-    {
+    public struct Request: Codable {
         /// The IP address to lookup. This parameter is required.
         public var query: String
         /// If you don't require all the returned fields use this property to specify which fields to return. *Tip: Disabling* `reverse` *may improve performance*. This parameter is optional.
@@ -190,7 +181,7 @@ open class Service
     // MARK: - Initialization -
     
     /// The default instance of `Service` initialized with default values.
-    open static let `default` = Service()
+    public static let `default` = Service()
     
     /// Initializes the `Service` instance with the given timeout interval.
     ///
@@ -200,8 +191,7 @@ open class Service
     ///
     /// - Returns: The new `Service` instance.
     public init(timeoutInterval: TimeInterval = 15,
-                configuration: URLSessionConfiguration = URLSessionConfiguration.default)
-    {
+                configuration: URLSessionConfiguration = URLSessionConfiguration.default) {
         self.timeoutInterval = timeoutInterval
         self.configuration = configuration
     }
@@ -216,8 +206,7 @@ open class Service
     ///   - language: Localized `city`, `regionName` and `countryName` can be requested by using this property in the `ISO 639` format.
     ///   - completion: A closure that will be called upon completion.
     /// - Returns: The new `URLSessionDataTask` instance.
-    @discardableResult open func fetch(query: String? = nil, fields: [Result.Field]? = nil, language: String? = nil, completion: ((_ result: Result?, _ error: Swift.Error?) -> Void)?) -> URLSessionDataTask?
-    {
+    @discardableResult open func fetch(query: String? = nil, fields: [Result.Field]? = nil, language: String? = nil, completion: ((_ result: Result?, _ error: Swift.Error?) -> Void)?) -> URLSessionDataTask? {
         var urlString = "\(type(of: self).baseURLString)/json"
         if let query = query {
             urlString += "/\(query)"
@@ -273,8 +262,7 @@ open class Service
     ///   - queries: The requests.
     ///   - completion: A closure that will be called upon completion.
     /// - Returns: The new `URLSessionDataTask` instance.
-    @discardableResult open func batch(_ queries: [Request], completion: ((_ result: [Result]?, _ error: Swift.Error?) -> Void)?) -> URLSessionDataTask?
-    {
+    @discardableResult open func batch(_ queries: [Request], completion: ((_ result: [Result]?, _ error: Swift.Error?) -> Void)?) -> URLSessionDataTask? {
         let urlString = "\(type(of: self).baseURLString)/batch"
         guard let urlComponents = URLComponents(string: urlString) else {
             completion?(nil, Error.invalidURL)
@@ -287,7 +275,7 @@ open class Service
         }
         
         let encoder = JSONEncoder()
-        let body = queries.flatMap({ try? encoder.encode($0) }).flatMap({ String(data: $0, encoding: .utf8) })
+        let body = queries.compactMap({ try? encoder.encode($0) }).compactMap({ String(data: $0, encoding: .utf8) })
         guard let jsonBody = try? JSONSerialization.data(withJSONObject: body, options: []) else {
             completion?(nil, Error.invalidRequestData)
             return nil

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "AliSoftware/OHHTTPStubs" "6.0.0"`
	`1`	`+github "AliSoftware/OHHTTPStubs" "6.1.0"`