Migrate to Swift 4.2

This commit is contained in:
Wojciech Nagrodzki 2019-03-14 18:35:41 +01:00
parent 533c4a6757
commit c714b9f188
Signed by: wnagrodzki
GPG key ID: E9D0EB0302264569
3 changed files with 17 additions and 8 deletions

View file

@ -196,15 +196,18 @@
TargetAttributes = { TargetAttributes = {
2EA02D081D78A64800FEB930 = { 2EA02D081D78A64800FEB930 = {
CreatedOnToolsVersion = 8.0; CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
2EA02D1C1D78A64800FEB930 = { 2EA02D1C1D78A64800FEB930 = {
CreatedOnToolsVersion = 8.0; CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
TestTargetID = 2EA02D081D78A64800FEB930; TestTargetID = 2EA02D081D78A64800FEB930;
}; };
2EA02D271D78A64800FEB930 = { 2EA02D271D78A64800FEB930 = {
CreatedOnToolsVersion = 8.0; CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
TestTargetID = 2EA02D081D78A64800FEB930; TestTargetID = 2EA02D081D78A64800FEB930;
}; };
@ -420,7 +423,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
}; };
name = Debug; name = Debug;
}; };
@ -432,7 +436,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
}; };
name = Release; name = Release;
}; };
@ -445,7 +450,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerTests; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DragGestureRecognizer.app/DragGestureRecognizer"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DragGestureRecognizer.app/DragGestureRecognizer";
}; };
name = Debug; name = Debug;
@ -459,7 +465,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerTests; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DragGestureRecognizer.app/DragGestureRecognizer"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DragGestureRecognizer.app/DragGestureRecognizer";
}; };
name = Release; name = Release;
@ -472,7 +479,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerUITests; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerUITests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = DragGestureRecognizer; TEST_TARGET_NAME = DragGestureRecognizer;
}; };
name = Debug; name = Debug;
@ -485,7 +493,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerUITests; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerUITests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = DragGestureRecognizer; TEST_TARGET_NAME = DragGestureRecognizer;
}; };
name = Release; name = Release;

View file

@ -30,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow? 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. // Override point for customization after application launch.
return true return true
} }

View file

@ -46,7 +46,7 @@ class DragGestureRecognizer: UILongPressGestureRecognizer {
initialTouchLocationsInViews[inView] = initialLocation initialTouchLocationsInViews[inView] = initialLocation
} }
override var state: UIGestureRecognizerState { override var state: UIGestureRecognizer.State {
didSet { didSet {