Merge pull request #301 from evermeer/Swift5.0

Swift5.0

Carthage/Carthage.xcodeproj/project.pbxproj

@@ -666,7 +666,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = nl.evict.EVReflectioniOS;
 				PRODUCT_NAME = EVReflection;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -689,7 +689,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = nl.evict.EVReflectioniOS;
 				PRODUCT_NAME = EVReflection;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -715,7 +715,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = macosx;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -740,7 +740,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = macosx;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -875,7 +875,7 @@
 				PRODUCT_NAME = EVReflection;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -899,7 +899,7 @@
 				PRODUCT_NAME = EVReflection;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -924,7 +924,7 @@
 				PRODUCT_NAME = EVReflection;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -948,7 +948,7 @@
 				PRODUCT_NAME = EVReflection;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1041,6 +1041,7 @@
 				PRODUCT_NAME = EVReflection_CloudKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1079,7 +1080,7 @@
 				PRODUCT_NAME = EVReflection_CloudKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

Carthage/Carthage.xcodeproj/xcshareddata/xcschemes/EVReflection_CloudKit_MacOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Carthage/Carthage.xcodeproj/xcshareddata/xcschemes/EVReflection_CloudKit_iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Carthage/Carthage.xcodeproj/xcshareddata/xcschemes/EVReflection_MacOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Carthage/Carthage.xcodeproj/xcshareddata/xcschemes/EVReflection_TVOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Carthage/Carthage.xcodeproj/xcshareddata/xcschemes/EVReflection_WatchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Carthage/Carthage.xcodeproj/xcshareddata/xcschemes/EVReflection_iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Demo.xcodeproj/project.pbxproj

@@ -18,7 +18,6 @@
 		5EC197EF1A1BB16D00F4DFD4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5EC197EE1A1BB16D00F4DFD4 /* Images.xcassets */; };
 		5EC197F21A1BB16D00F4DFD4 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5EC197F01A1BB16D00F4DFD4 /* LaunchScreen.xib */; };
 		5EC198081A1BB24600F4DFD4 /* MoyaGitHubAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EC198071A1BB24600F4DFD4 /* MoyaGitHubAPI.swift */; };
-		7F1C9D351E23CE5100A18776 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 7F1C9D341E23CE5000A18776 /* README.md */; };
 		7FC775DE1E211D70003D436E /* MoyaRxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FC775DD1E211D70003D436E /* MoyaRxViewController.swift */; };
 		7FC775E01E211F34003D436E /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FC775DF1E211F34003D436E /* BaseViewController.swift */; };
 		8D04635AFFA1A664FE1E4309 /* Pods_44Demo5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C68491FBE0DB12F9562176A /* Pods_44Demo5.framework */; };
@@ -297,7 +296,6 @@
 				5EC198081A1BB24600F4DFD4 /* MoyaGitHubAPI.swift in Sources */,
 				306F6BF91D22BCF400F727A6 /* Owner.swift in Sources */,
 				7FC775E01E211F34003D436E /* BaseViewController.swift in Sources */,
-				7F1C9D351E23CE5100A18776 /* README.md in Sources */,
 				306F6BF71D22BCEB00F727A6 /* Repository.swift in Sources */,
 				13FEBE801FE101BE008716AA /* License.swift in Sources */,
 				13FEBE821FE10539008716AA /* GitHubUser.swift in Sources */,

Demo/Demo.xcodeproj/xcuserdata/evermeer.xcuserdatad/xcschemes/Demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Demo/BaseViewController.swift

@@ -52,7 +52,7 @@ class BaseViewController: UITableViewController {
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as UITableViewCell
         let repo = repos[(indexPath as NSIndexPath).row]
-        (cell.textLabel as UILabel!).text = repo.name
+        cell.textLabel?.text = repo.name
         return cell
     }
 }

EVReflection.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "EVReflection"
-  s.version      = "5.9.1"
+  s.version      = "5.9.0"
   s.summary      = "Reflection based object mapping. (Dictionary, CKRecord, NSManagedObject, Realm, JSON, XML, Alamofire, Moya, RxSwift, ReactiveSwift)"
 
   s.description  = <<-EOS

EVReflection.xcworkspace/xcuserdata/evermeer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -24,7 +24,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.IDETestFailureBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             breakpointStackSelectionBehavior = "1">

PerformanceTest/PerformanceTest.xcodeproj/project.pbxproj

@@ -388,7 +388,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = nl.evict.PerformanceTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_DISABLE_SAFETY_CHECKS = NO;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -405,7 +405,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = nl.evict.PerformanceTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_DISABLE_SAFETY_CHECKS = NO;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

PerformanceTest/PerformanceTest/ViewController.swift

@@ -110,9 +110,12 @@ class ViewController: UIViewController {
 
     func testIssue213() {
         let path: String = Bundle(for: type(of: self)).path(forResource: "test", ofType: "json") ?? ""
-        let content = try! String(contentsOfFile: path)
-        let data = ResultArrayWrapper<Spot>(json: content)
-        print("\(data)")
+        if let content = try? String(contentsOfFile: path) {
+            let data = ResultArrayWrapper<Spot>(json: content)
+            print("\(data)")
+        } else {
+            assert(true)
+        }
     }
 
 }
@@ -163,7 +166,7 @@ class TestObject2: EVObject {
         name = "Object2 Name \(id)"
     }
     //workaround
-    @available(*, deprecated: 0.0.1, message: "init isn't supported, use init(id:) instead")
+    @available(*, deprecated, message: "init isn't supported, use init(id:) instead")
     required init() {
         super.init()
     }
@@ -199,7 +202,7 @@ class ResultArrayWrapper<T: Model>: EVObject, EVGenericsKVC {
             break;
 
         default:
-            print("---> setValue '\(value)' for key '\(key)' should be handled.")
+            print("---> setValue '\(value ?? [] as AnyObject)' for key '\(key)' should be handled.")
         }
     }
 

Podfile

@@ -41,5 +41,11 @@ target '44Demo5' do
     alllibraries
 end
 
-
+post_install do |installer|
+    installer.pods_project.targets.each do |target|
+        target.build_configurations.each do |config|
+            config.build_settings['SWIFT_VERSION'] = '5.0'
+        end
+    end
+end
 

Podfile.lock

@@ -1,38 +1,38 @@
 PODS:
   - Alamofire (4.8.1)
-  - EVReflection/Alamofire (5.8.0):
+  - EVReflection/Alamofire (5.9.0):
     - Alamofire
     - EVReflection/Core
-  - EVReflection/AlamofireXML (5.8.0):
+  - EVReflection/AlamofireXML (5.9.0):
     - EVReflection/Alamofire
     - EVReflection/XML
-  - EVReflection/CloudKit (5.8.0):
+  - EVReflection/CloudKit (5.9.0):
     - EVReflection/Core
-  - EVReflection/Core (5.8.0)
-  - EVReflection/CoreData (5.8.0):
+  - EVReflection/Core (5.9.0)
+  - EVReflection/CoreData (5.9.0):
     - EVReflection/Core
-  - EVReflection/Moya (5.8.0):
+  - EVReflection/Moya (5.9.0):
     - EVReflection/Alamofire
     - Moya
-  - EVReflection/MoyaReactiveSwift (5.8.0):
+  - EVReflection/MoyaReactiveSwift (5.9.0):
     - EVReflection/Moya
     - Moya/ReactiveSwift
-  - EVReflection/MoyaReactiveSwiftXML (5.8.0):
+  - EVReflection/MoyaReactiveSwiftXML (5.9.0):
     - EVReflection/MoyaReactiveSwift
     - EVReflection/MoyaXML
-  - EVReflection/MoyaRxSwift (5.8.0):
+  - EVReflection/MoyaRxSwift (5.9.0):
     - EVReflection/Moya
     - Moya/RxSwift
-  - EVReflection/MoyaRxSwiftXML (5.8.0):
+  - EVReflection/MoyaRxSwiftXML (5.9.0):
     - EVReflection/MoyaRxSwift
     - EVReflection/MoyaXML
-  - EVReflection/MoyaXML (5.8.0):
+  - EVReflection/MoyaXML (5.9.0):
     - EVReflection/AlamofireXML
     - EVReflection/Moya
-  - EVReflection/Realm (5.8.0):
+  - EVReflection/Realm (5.9.0):
     - EVReflection/Core
     - RealmSwift
-  - EVReflection/XML (5.8.0):
+  - EVReflection/XML (5.9.0):
     - EVReflection/Core
     - XMLDictionary
   - Moya (12.0.1):
@@ -54,8 +54,8 @@ PODS:
   - RealmSwift (3.13.1):
     - Realm (= 3.13.1)
   - Result (4.1.0)
-  - RxAtomic (4.4.0)
-  - RxSwift (4.4.0):
+  - RxAtomic (4.4.1)
+  - RxSwift (4.4.1):
     - RxAtomic (~> 4.4)
   - XMLDictionary (1.4.1)
 
@@ -85,16 +85,16 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
-  EVReflection: bd84ca5ff98d2479966df23d41787b08137b3f8d
+  EVReflection: 52aa00a9035145b1fcf99acae01b782ecc4adad7
   Moya: cf730b3cd9e005401ef37a85143aa141a12fd38f
   ReactiveSwift: a2bb9ace428a109e9c0209615645d9d286c8c433
   Realm: 50071da38fe079e0735e47c9f2eae738c68c5996
   RealmSwift: 8a1e6a02b7a08cd17a31e3115143fb69fe5f3fb9
   Result: bd966fac789cc6c1563440b348ab2598cc24d5c7
-  RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
-  RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
+  RxAtomic: f8d6adc1ccb87a767811269e4875887bc74dbf19
+  RxSwift: 92fcf68dfef21f3e2ab1965363d9e7b3d787597e
   XMLDictionary: fa07b6ff422b3a91d47a5de9bc82e3fc04fbd167
 
-PODFILE CHECKSUM: e4a7466c5b38806b825e545608a3a6a3c5846e37
+PODFILE CHECKSUM: df2a70b11777d457966cfd407256116fcd1e2bdf
 
-COCOAPODS: 1.6.0.beta.1
+COCOAPODS: 1.6.0