From beb1b7021bcd2b920911d11f5e3c075716575670 Mon Sep 17 00:00:00 2001 From: corin8823 Date: Sat, 1 Dec 2018 21:44:13 +0900 Subject: [PATCH] Fix bug for swift4.2 --- Example/Popover.xcodeproj/project.pbxproj | 16 ++++++---------- Example/Popover/AppDelegate.swift | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Example/Popover.xcodeproj/project.pbxproj b/Example/Popover.xcodeproj/project.pbxproj index 1a78b1c..7a397c0 100644 --- a/Example/Popover.xcodeproj/project.pbxproj +++ b/Example/Popover.xcodeproj/project.pbxproj @@ -195,13 +195,13 @@ TargetAttributes = { 01A491C91E222AFB007E15FA = { CreatedOnToolsVersion = 8.2.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; TestTargetID = 607FACCF1AFB9204008FA782; }; 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1010; }; }; }; @@ -344,8 +344,7 @@ PRODUCT_BUNDLE_IDENTIFIER = corin8823.PopoverExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PopoverExample.app/PopoverExample"; }; name = Debug; @@ -361,8 +360,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = corin8823.PopoverExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PopoverExample.app/PopoverExample"; }; name = Release; @@ -486,8 +484,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -507,8 +504,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/Popover/AppDelegate.swift b/Example/Popover/AppDelegate.swift index 5085876..b04d41d 100644 --- a/Example/Popover/AppDelegate.swift +++ b/Example/Popover/AppDelegate.swift @@ -13,7 +13,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 { // Override point for customization after application launch. return true }