From 33415d8a5a61b0b58400eb96cee31532fffbbe80 Mon Sep 17 00:00:00 2001 From: Xin Date: Fri, 21 Sep 2018 17:42:33 +0800 Subject: [PATCH] support Xcode 10.0 --- .travis.yml | 4 ++-- Example.xcodeproj/project.pbxproj | 4 ++-- Example/AppDelegate.swift | 4 ++-- Example/Cartfile.resolved | 2 +- Example/Info.plist | 4 ++-- ManagedObjectAdapter.xcodeproj/project.pbxproj | 12 ++++++------ ManagedObjectAdapter/Supporting Files/Info-iOS.plist | 2 +- .../Supporting Files/Info-watchOS.plist | 2 +- ManagedObjectAdapterTests/Info.plist | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c74986..78d7597 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: objective-c -osx_image: xcode9.3 +osx_image: xcode10.0 script: -- xcodebuild build test -workspace ManagedObjectAdapter.xcworkspace -scheme 'ManagedObjectAdapter iOS' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X,OS=11.3' +- xcodebuild build test -workspace ManagedObjectAdapter.xcworkspace -scheme 'ManagedObjectAdapter iOS' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X,OS=12.0' diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj index e04ce4f..bd3f2fb 100644 --- a/Example.xcodeproj/project.pbxproj +++ b/Example.xcodeproj/project.pbxproj @@ -406,7 +406,7 @@ PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapter.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -423,7 +423,7 @@ PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapter.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift index 24c80e9..7db465e 100644 --- a/Example/AppDelegate.swift +++ b/Example/AppDelegate.swift @@ -12,9 +12,9 @@ import UIKit 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]? = nil) -> Bool { // Override point for customization after application launch. - UINavigationBar.appearance().tintColor = UIColor.red + UINavigationBar.appearance().tintColor = .red return true } diff --git a/Example/Cartfile.resolved b/Example/Cartfile.resolved index 7b5372c..bec9bca 100644 --- a/Example/Cartfile.resolved +++ b/Example/Cartfile.resolved @@ -1 +1 @@ -github "Hearst-DD/ObjectMapper" "3.1.0" +github "Hearst-DD/ObjectMapper" "3.3.0" diff --git a/Example/Info.plist b/Example/Info.plist index cd3eff8..492f5e4 100644 --- a/Example/Info.plist +++ b/Example/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.0.5 + 0.0.6 CFBundleSignature ???? CFBundleVersion - 5 + 6 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/ManagedObjectAdapter.xcodeproj/project.pbxproj b/ManagedObjectAdapter.xcodeproj/project.pbxproj index 94da95c..55a9c69 100644 --- a/ManagedObjectAdapter.xcodeproj/project.pbxproj +++ b/ManagedObjectAdapter.xcodeproj/project.pbxproj @@ -424,7 +424,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -444,7 +444,7 @@ PRODUCT_NAME = ManagedObjectAdapter; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -456,7 +456,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapterTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -468,7 +468,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = Teambition.ManagedObjectAdapterTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -489,7 +489,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -512,7 +512,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; diff --git a/ManagedObjectAdapter/Supporting Files/Info-iOS.plist b/ManagedObjectAdapter/Supporting Files/Info-iOS.plist index 2a44702..2730238 100644 --- a/ManagedObjectAdapter/Supporting Files/Info-iOS.plist +++ b/ManagedObjectAdapter/Supporting Files/Info-iOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.0.5 + 0.0.6 CFBundleSignature ???? CFBundleVersion diff --git a/ManagedObjectAdapter/Supporting Files/Info-watchOS.plist b/ManagedObjectAdapter/Supporting Files/Info-watchOS.plist index 2a44702..2730238 100644 --- a/ManagedObjectAdapter/Supporting Files/Info-watchOS.plist +++ b/ManagedObjectAdapter/Supporting Files/Info-watchOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.0.5 + 0.0.6 CFBundleSignature ???? CFBundleVersion diff --git a/ManagedObjectAdapterTests/Info.plist b/ManagedObjectAdapterTests/Info.plist index 0d7111d..842f19b 100644 --- a/ManagedObjectAdapterTests/Info.plist +++ b/ManagedObjectAdapterTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.0.5 + 0.0.6 CFBundleSignature ???? CFBundleVersion