Swift 4.2 support (#74)

* Update code to support Swift 4.2

* Use Xcode 10 on CI, rather than Xcode 9

* Use iOS 12 for building, rather than iOS 11

* Update Swiflint file to set min identifier length to 1

* Change Swift version to 4.2 for tests and example app

* Update variable names to fix SwiftLint min_identifier length violation

* Updatw Swift version from 3.0 to 4.2

* Remove min_identifier length = 1

* Update pod version to 8.0.0

* Update changelog

.swift-version

@@ -1 +1 @@
-3.0
+4.2

.swiftlint.yml

@@ -1,3 +1,3 @@
 disabled_rules:
   - line_length
-  - nesting
+  - nesting

.travis.yml

@@ -1,10 +1,10 @@
 os:
   - osx
 language: generic
-osx_image: xcode9
+osx_image: xcode10
 script:
   # - xcrun instruments -t 'Blank' -l 10 -w "iPhone 6s (10.3)"
-  - xcodebuild -scheme Example -configuration Debug -sdk iphonesimulator11.0 -destination "OS=11.0,name=iPhone 6s" build
-  - xcodebuild -scheme TABResourceLoader -configuration Debug -sdk iphonesimulator11.0 -destination "OS=11.0,name=iPhone 6s" test -enableCodeCoverage YES
+  - xcodebuild -scheme Example -configuration Debug -sdk iphonesimulator12.0 -destination "OS=12.0,name=iPhone 6s" build
+  - xcodebuild -scheme TABResourceLoader -configuration Debug -sdk iphonesimulator12.0 -destination "OS=12.0,name=iPhone 6s" test -enableCodeCoverage YES
 after_success:
   - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 8.0.0
+
+- Add Swift 4.2 support
+
 ## 7.2.2
 
 - Adds  optional  `requestTimeoutInterval`  property to `NetworkResourceType` which can be used to set a `URLRequest` specific timeout for the resource.

Example/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     setupNetworkActivityHandler(for: application)
     return true
   }

Example/Models/Multiple responses example/CitiesResponse.swift

@@ -21,7 +21,7 @@ enum CitiesResponse {
 extension CitiesResponse {
   public init(jsonDictionary: [String : Any]) throws {
     if let citiesJSONArray = jsonDictionary["cities"] as? [[String: Any]] {
-      self = .cities(citiesJSONArray.flatMap(City.init))
+      self = .cities(citiesJSONArray.compactMap(City.init))
     } else if let city = City(jsonDictionary: jsonDictionary) {
       self = .city(city)
     } else if let serverError = ServerError(jsonDictionary: jsonDictionary) {

Example/Models/Simple example/CitiesResource.swift

@@ -31,7 +31,7 @@ struct CitiesResource: NetworkJSONDictionaryResourceType {
       else {
         throw CitiesResourceError.parsingFailed
     }
-    return citiesJSONArray.flatMap(City.init)
+    return citiesJSONArray.compactMap(City.init)
   }
 
 }

Sources/TABResourceLoader/Concrete types/Result.swift

@@ -47,8 +47,8 @@ extension Result {
   // Convert the `Result` back to typical Swift `throws` error handling
   public func unwrap() throws -> T {
     switch self {
-    case .success(let v): return v
-    case .failure(let e): throw e
+    case .success(let capturedValue): return capturedValue
+    case .failure(let error): throw error
     }
   }
 }

TABResourceLoader.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name         = 'TABResourceLoader'
   spec.homepage     = 'https://github.com/theappbusiness/TABResourceLoader'
-  spec.version      = '7.2.2'
+  spec.version      = '8.0.0'
   spec.license      = { :type => 'MIT' }
   spec.authors      = { 'Luciano Marisi' => '[email protected]' }
   spec.summary      = 'Framework for loading resources from a network service'

TABResourceLoader.xcodeproj/project.pbxproj

@@ -612,7 +612,7 @@
 					};
 					4F079CD81D84559200D08DA0 = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 					};
 					4F8D1FB91D8DFFD30099DD9A = {
 						CreatedOnToolsVersion = 8.0;
@@ -935,7 +935,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -955,7 +955,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -967,7 +967,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucianomarisi.TABResourceLoaderTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -979,7 +979,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucianomarisi.TABResourceLoaderTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -996,7 +996,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucianomarisi.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1012,7 +1012,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucianomarisi.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Tests/TABResourceLoaderTests/Mocks/MockJSONArrayResourceType.swift

@@ -13,7 +13,7 @@ struct MockJSONArrayResourceType: JSONArrayResourceType {
   typealias Model = [MockObject]
 
   func model(from jsonArray: [Any]) throws -> [MockObject] {
-    let parsedMockObjects: [MockObject] = jsonArray.flatMap {
+    let parsedMockObjects: [MockObject] = jsonArray.compactMap {
       guard let jsonDictionary = $0 as? [String: Any] else { return nil }
       return MockObject(jsonDictionary: jsonDictionary)
     }

Tests/TABResourceLoaderTests/Protocols/ImageResourceTypeTests.swift

@@ -33,7 +33,7 @@ class ImageResourceTypeTests: XCTestCase {
 
   func test_resultFromData_whenDataIsValid() {
     let mockImage = ImageMocker.mock()
-    let imageData = UIImagePNGRepresentation(mockImage)!
+    let imageData = mockImage.pngData()!
     let testResult = try? mockImageResourceType.model(from: imageData)
     XCTAssertNotNil(testResult)
   }