Merge pull request #1 from teambition/swift5

swift 5
alibaba-archive · Apr 11, 2019 · 6758783 · 6758783
2 parents 33415d8 + f0cb927
commit 6758783
Show file tree

Hide file tree

Showing 18 changed files with 59 additions and 74 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode10.0
+osx_image: xcode10.2
 script:
-- xcodebuild build test -workspace ManagedObjectAdapter.xcworkspace -scheme 'ManagedObjectAdapter iOS' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X,OS=12.0' 
+- xcodebuild build test -workspace ManagedObjectAdapter.xcworkspace -scheme 'ManagedObjectAdapter iOS' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X,OS=12.2' 
diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj
@@ -191,7 +191,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Teambition;
 				TargetAttributes = {
 					D3283CA91D48812300E1B445 = {
@@ -202,7 +202,7 @@
 			};
 			buildConfigurationList = D3283CA51D48812300E1B445 /* Build configuration list for PBXProject "Example" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -291,6 +291,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -347,6 +348,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -406,7 +408,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapter.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -423,7 +425,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapter.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example.xcodeproj/xcuserdata/hongxin.xcuserdatad/xcschemes/Example.xcscheme b/Example.xcodeproj/xcuserdata/hongxin.xcuserdatad/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/Cartfile.resolved b/Example/Cartfile.resolved
@@ -1 +1 @@
-github "Hearst-DD/ObjectMapper" "3.3.0"
+github "Hearst-DD/ObjectMapper" "3.4.2"
diff --git a/Example/EventsViewController.swift b/Example/EventsViewController.swift
@@ -31,12 +31,12 @@ class EventsViewController: UITableViewController {
     }
 
     // MARK: - Helper
-    fileprivate func setupUI() {
+    private func setupUI() {
         navigationItem.title = "Events"
         tableView.tableFooterView = UIView()
     }
 
-    fileprivate func loadData() {
+    private func loadData() {
         guard let path = Bundle(identifier: "Teambition.ManagedObjectAdapter.Example")?.path(forResource: "events", ofType: "json") ?? Bundle.main.path(forResource: "events", ofType: "json") else {
             return
         }
@@ -49,11 +49,7 @@ class EventsViewController: UITableViewController {
             return
         }
 
-        guard let events = json?.compactMap({ (object) -> Event? in
-            return Event(object)
-        }) else {
-            return
-        }
+        let events = json.compactMap { Event($0) }
         self.events = events
         tableView.reloadData()
     }

diff --git a/Example/ExampleViewController.swift b/Example/ExampleViewController.swift
@@ -40,12 +40,12 @@ class ExampleViewController: UITableViewController {
     }
 
     // MARK: - Helper
-    fileprivate func setupUI() {
+    private func setupUI() {
         navigationItem.title = "Example"
         tableView.tableFooterView = UIView()
     }
 
-    fileprivate func loadData() {
+    private func loadData() {
         guard let path = Bundle(identifier: "Teambition.ManagedObjectAdapter.Example")?.path(forResource: "organizations", ofType: "json") ?? Bundle.main.path(forResource: "organizations", ofType: "json") else {
             return
         }
@@ -58,11 +58,7 @@ class ExampleViewController: UITableViewController {
             return
         }
 
-        guard let organizations = json?.compactMap({ (object) -> Organization? in
-            return Organization(object)
-        }) else {
-            return
-        }
+        let organizations = json.compactMap { Organization($0) }
         self.organizations = organizations
         tableView.reloadData()
     }

diff --git a/Example/Info.plist b/Example/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/Example/ProjectsViewController.swift b/Example/ProjectsViewController.swift
@@ -38,13 +38,13 @@ class ProjectsViewController: UITableViewController {
     }
 
     // MARK: - Life cycle
-    fileprivate func setupUI() {
+    private func setupUI() {
         navigationItem.title = "Projects"
         tableView.tableFooterView = UIView()
     }
 
     // MARK: - Helper
-    fileprivate func loadData() {
+    private func loadData() {
         guard let path = Bundle(identifier: "Teambition.ManagedObjectAdapter.Example")?.path(forResource: "projects", ofType: "json") ?? Bundle.main.path(forResource: "projects", ofType: "json") else {
             return
         }
@@ -57,11 +57,7 @@ class ProjectsViewController: UITableViewController {
             return
         }
 
-        guard let projects = json?.compactMap({ (object) -> Project? in
-            return Project(object)
-        }) else {
-            return
-        }
+        let projects = json.compactMap { Project($0) }
         self.projects = projects
         tableView.reloadData()
     }

diff --git a/ManagedObjectAdapter.xcodeproj/project.pbxproj b/ManagedObjectAdapter.xcodeproj/project.pbxproj
@@ -195,7 +195,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Teambition;
 				TargetAttributes = {
 					D3283C951D4880C500E1B445 = {
@@ -214,10 +214,11 @@
 			};
 			buildConfigurationList = D3283C901D4880C500E1B445 /* Build configuration list for PBXProject "ManagedObjectAdapter" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = D3283C8C1D4880C500E1B445;
 			productRefGroup = D3283C971D4880C500E1B445 /* Products */;
@@ -299,6 +300,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -358,6 +360,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -424,7 +427,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -444,7 +447,7 @@
 				PRODUCT_NAME = ManagedObjectAdapter;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -456,7 +459,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapterTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -468,7 +471,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapterTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -489,7 +492,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -512,7 +515,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};

diff --git a/ManagedObjectAdapter.xcodeproj/xcshareddata/xcschemes/ManagedObjectAdapter iOS.xcscheme b/ManagedObjectAdapter.xcodeproj/xcshareddata/xcschemes/ManagedObjectAdapter iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ManagedObjectAdapter.xcodeproj/xcshareddata/xcschemes/ManagedObjectAdapter watchOS.xcscheme b/ManagedObjectAdapter.xcodeproj/xcshareddata/xcschemes/ManagedObjectAdapter watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...ter.xcodeproj/xcuserdata/hongxin.xcuserdatad/xcschemes/ManagedObjectAdapterTests.xcscheme b/...ter.xcodeproj/xcuserdata/hongxin.xcuserdatad/xcschemes/ManagedObjectAdapterTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"