From 533c4a675728d3b6c97561ba81471929e76d19b5 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Thu, 14 Mar 2019 18:35:31 +0100 Subject: [PATCH 1/4] Add IDEWorkspaceChecks.plist to tracked files --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 DragGestureRecognizer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/DragGestureRecognizer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DragGestureRecognizer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/DragGestureRecognizer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From c714b9f1881f97b860bb6156b8c32f551299e972 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Thu, 14 Mar 2019 18:35:41 +0100 Subject: [PATCH 2/4] Migrate to Swift 4.2 --- .../project.pbxproj | 21 +++++++++++++------ DragGestureRecognizer/AppDelegate.swift | 2 +- .../DragGestureRecognizer.swift | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/DragGestureRecognizer.xcodeproj/project.pbxproj b/DragGestureRecognizer.xcodeproj/project.pbxproj index 9ecd6ae..e0c7bab 100644 --- a/DragGestureRecognizer.xcodeproj/project.pbxproj +++ b/DragGestureRecognizer.xcodeproj/project.pbxproj @@ -196,15 +196,18 @@ TargetAttributes = { 2EA02D081D78A64800FEB930 = { CreatedOnToolsVersion = 8.0; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; 2EA02D1C1D78A64800FEB930 = { CreatedOnToolsVersion = 8.0; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; TestTargetID = 2EA02D081D78A64800FEB930; }; 2EA02D271D78A64800FEB930 = { CreatedOnToolsVersion = 8.0; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; TestTargetID = 2EA02D081D78A64800FEB930; }; @@ -420,7 +423,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -432,7 +436,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -445,7 +450,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerTests; 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"; }; name = Debug; @@ -459,7 +465,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerTests; 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"; }; name = Release; @@ -472,7 +479,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.2; TEST_TARGET_NAME = DragGestureRecognizer; }; name = Debug; @@ -485,7 +493,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizerUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.2; TEST_TARGET_NAME = DragGestureRecognizer; }; name = Release; diff --git a/DragGestureRecognizer/AppDelegate.swift b/DragGestureRecognizer/AppDelegate.swift index e1f8305..0169909 100644 --- a/DragGestureRecognizer/AppDelegate.swift +++ b/DragGestureRecognizer/AppDelegate.swift @@ -30,7 +30,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 } diff --git a/DragGestureRecognizer/DragGestureRecognizer.swift b/DragGestureRecognizer/DragGestureRecognizer.swift index b52ccfa..b524604 100644 --- a/DragGestureRecognizer/DragGestureRecognizer.swift +++ b/DragGestureRecognizer/DragGestureRecognizer.swift @@ -46,7 +46,7 @@ class DragGestureRecognizer: UILongPressGestureRecognizer { initialTouchLocationsInViews[inView] = initialLocation } - override var state: UIGestureRecognizerState { + override var state: UIGestureRecognizer.State { didSet { From e8214fc5b04570172939f1b8345b1d919edf25c9 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Thu, 14 Mar 2019 18:39:37 +0100 Subject: [PATCH 3/4] Remove SWIFT_SWIFT3_OBJC_INFERENCE build setting --- DragGestureRecognizer.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/DragGestureRecognizer.xcodeproj/project.pbxproj b/DragGestureRecognizer.xcodeproj/project.pbxproj index e0c7bab..7d90fc4 100644 --- a/DragGestureRecognizer.xcodeproj/project.pbxproj +++ b/DragGestureRecognizer.xcodeproj/project.pbxproj @@ -423,7 +423,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_VERSION = 4.2; }; name = Debug; @@ -436,7 +435,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.DragGestureRecognizer; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_VERSION = 4.2; }; name = Release; From a1fcc3dcb7c6f8c4c7865204ed85235f95ddd47e Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Thu, 14 Mar 2019 18:40:21 +0100 Subject: [PATCH 4/4] Apply recommended project settings --- .../project.pbxproj | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/DragGestureRecognizer.xcodeproj/project.pbxproj b/DragGestureRecognizer.xcodeproj/project.pbxproj index 7d90fc4..7c0829e 100644 --- a/DragGestureRecognizer.xcodeproj/project.pbxproj +++ b/DragGestureRecognizer.xcodeproj/project.pbxproj @@ -191,7 +191,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Wojciech Nagrodzki"; TargetAttributes = { 2EA02D081D78A64800FEB930 = { @@ -331,15 +331,24 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -381,15 +390,24 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;