From 16a44580ff56f238e30ce3976014c0de6979b334 Mon Sep 17 00:00:00 2001 From: Willy Breitenbach Date: Thu, 27 Sep 2018 14:39:38 +0200 Subject: [PATCH] updated to Swift 4.2 --- .swift-version | 2 +- Example/Example.xcodeproj/project.pbxproj | 9 ++++----- TouchVisualizer/TouchView.swift | 2 +- TouchVisualizer/Visualizer.swift | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index c3177f8..3df9267 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -193,7 +193,6 @@ TargetAttributes = { FF828F141A74E52500DC12EF = { CreatedOnToolsVersion = 6.1.1; - DevelopmentTeam = 8Y439RUF7P; LastSwiftMigration = 0900; }; FF828F291A74E52500DC12EF = { @@ -409,7 +408,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 8Y439RUF7P; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Example/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -417,7 +416,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -429,7 +428,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 8Y439RUF7P; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Example/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -437,7 +436,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/TouchVisualizer/TouchView.swift b/TouchVisualizer/TouchView.swift index 6c46ddb..8b5f1c8 100644 --- a/TouchVisualizer/TouchView.swift +++ b/TouchVisualizer/TouchView.swift @@ -74,7 +74,7 @@ final public class TouchView: UIImageView { RunLoop .main - .add(timer!, forMode: RunLoopMode.commonModes) + .add(timer!, forMode: RunLoop.Mode.common) if _config.showsTimer { timerLabel.alpha = 1.0 diff --git a/TouchVisualizer/Visualizer.swift b/TouchVisualizer/Visualizer.swift index 917ba0e..4e763e6 100644 --- a/TouchVisualizer/Visualizer.swift +++ b/TouchVisualizer/Visualizer.swift @@ -19,11 +19,11 @@ final public class Visualizer:NSObject { super.init() NotificationCenter .default - .addObserver(self, selector: #selector(Visualizer.orientationDidChangeNotification(_:)), name: NSNotification.Name.UIDeviceOrientationDidChange, object: nil) + .addObserver(self, selector: #selector(Visualizer.orientationDidChangeNotification(_:)), name: UIDevice.orientationDidChangeNotification, object: nil) NotificationCenter .default - .addObserver(self, selector: #selector(Visualizer.applicationDidBecomeActiveNotification(_:)), name: NSNotification.Name.UIApplicationDidBecomeActive, object: nil) + .addObserver(self, selector: #selector(Visualizer.applicationDidBecomeActiveNotification(_:)), name: UIApplication.didBecomeActiveNotification, object: nil) UIDevice .current @@ -132,7 +132,7 @@ extension Visualizer { return nil } - open func handleEvent(_ event: UIEvent) { + public func handleEvent(_ event: UIEvent) { if event.type != .touches { return }