From 33d2602f0a315e1ecb795d2227f57451ca5f71f1 Mon Sep 17 00:00:00 2001 From: Sven Tiigi Date: Thu, 29 Mar 2018 21:15:51 +0200 Subject: [PATCH] Updated to Swift 4.1 --- .swiftlint.yml | 1 + FlyoverKit.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/FlyoverKit.xcscheme | 8 +++----- .../FlyoverConfigurationTableView.swift | 8 ++------ FlyoverKitExample/ViewController.swift | 14 ++++++++------ 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 79213f2..9685f23 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -20,5 +20,6 @@ excluded: # paths to ignore during linting. Takes precedence over `included`. disabled_rules: # rule identifiers to exclude from running - trailing_whitespace + - identifier_name line_length: 130 diff --git a/FlyoverKit.xcodeproj/project.pbxproj b/FlyoverKit.xcodeproj/project.pbxproj index 81417ac..23acbdd 100644 --- a/FlyoverKit.xcodeproj/project.pbxproj +++ b/FlyoverKit.xcodeproj/project.pbxproj @@ -357,7 +357,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Sven Tiigi"; TargetAttributes = { 3D8F94A3203D804F006E7659 = { @@ -545,6 +545,7 @@ 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; @@ -552,6 +553,7 @@ 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; @@ -605,6 +607,7 @@ 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; @@ -612,6 +615,7 @@ 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; diff --git a/FlyoverKit.xcodeproj/xcshareddata/xcschemes/FlyoverKit.xcscheme b/FlyoverKit.xcodeproj/xcshareddata/xcschemes/FlyoverKit.xcscheme index 9e41565..e7a4676 100644 --- a/FlyoverKit.xcodeproj/xcshareddata/xcschemes/FlyoverKit.xcscheme +++ b/FlyoverKit.xcodeproj/xcshareddata/xcschemes/FlyoverKit.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -57,7 +56,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/FlyoverKitExample/FlyoverConfiguration/FlyoverConfigurationTableView.swift b/FlyoverKitExample/FlyoverConfiguration/FlyoverConfigurationTableView.swift index faf835a..2ee3f6c 100644 --- a/FlyoverKitExample/FlyoverConfiguration/FlyoverConfigurationTableView.swift +++ b/FlyoverKitExample/FlyoverConfiguration/FlyoverConfigurationTableView.swift @@ -43,12 +43,8 @@ class FlyoverConfigurationTableView: UITableView { // MARK: Initializer - /// Default initializer with FlyoverConfigurationTableViewDelegate - /// - /// - Parameter configurationDelegate: The delegate - init(configurationDelegate: FlyoverConfigurationTableViewDelegate) { - // Set configuration delegate - self.configurationDelegate = configurationDelegate + /// Default initializer + init() { // Super init super.init(frame: .zero, style: .plain) // Set delegate to self diff --git a/FlyoverKitExample/ViewController.swift b/FlyoverKitExample/ViewController.swift index 80c2e09..9401048 100644 --- a/FlyoverKitExample/ViewController.swift +++ b/FlyoverKitExample/ViewController.swift @@ -20,14 +20,10 @@ class ViewController: SplitScreenViewController { // MARK: Propertirs /// The FlyoverMapView - private lazy var flyoverMapView: FlyoverMapView = { - return FlyoverMapView(configurationTheme: .default) - }() + private var flyoverMapView: FlyoverMapView /// The ConfigurationTableView - private lazy var configurationTableView: FlyoverConfigurationTableView = { - return FlyoverConfigurationTableView(configurationDelegate: self) - }() + private var configurationTableView: FlyoverConfigurationTableView /// The example location // Change the enum case to explore different locations 🤙 @@ -51,8 +47,14 @@ class ViewController: SplitScreenViewController { configuration.dragView.startYPadding = 20 // Set white inner drag view background color configuration.dragInnerView.backgroundColor = .white + // Initialize FlyoverMapView + self.flyoverMapView = FlyoverMapView(configurationTheme: .default) + // Initialize ConfigurationTableView + self.configurationTableView = FlyoverConfigurationTableView() // Super init super.init(topView: self.flyoverMapView, bottomView: self.configurationTableView, configuration: configuration) + // Set ConfigurationDelegate + self.configurationTableView.configurationDelegate = self } /// Initializer with NSCoder always return nil