Finish conversion to Swift 4.2

ivnsch · Sep 25, 2018 · d1f4c58 · d1f4c58
1 parent 3d5b7da
commit d1f4c58
Show file tree

Hide file tree

Showing 45 changed files with 135 additions and 137 deletions.
diff --git a/Examples/AppDelegate.swift b/Examples/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
         if UIDevice.current.userInterfaceIdiom == .pad {
 

diff --git a/Examples/DetailViewController.swift b/Examples/DetailViewController.swift
@@ -114,10 +114,10 @@ class DetailViewController: UIViewController, UISplitViewControllerDelegate {
 
     fileprivate func showExampleController(_ controller: UIViewController) {
         if let currentExampleController = currentExampleController {
-            currentExampleController.removeFromParentViewController()
+            currentExampleController.removeFromParent()
             currentExampleController.view.removeFromSuperview()
         }
-        addChildViewController(controller)
+        addChild(controller)
         view.addSubview(controller.view)
         currentExampleController = controller
     }

diff --git a/Examples/Examples/AreasExample.swift b/Examples/Examples/AreasExample.swift
@@ -96,7 +96,7 @@ class AreasExample: UIViewController, ChartDelegate {
                     bubbleView.addSubview(infoView)
                     weakSelf.popups.append(bubbleView)
 
-                    UIView.animate(withDuration: 0.2, delay: 0, options: UIViewAnimationOptions(), animations: {
+                    UIView.animate(withDuration: 0.2, delay: 0, options: UIView.AnimationOptions(), animations: {
                         view.selected = true
                         selectedView = view
 
@@ -105,7 +105,7 @@ class AreasExample: UIViewController, ChartDelegate {
                 }
             }
 
-            UIView.animate(withDuration: 0.7, delay: 0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: UIViewAnimationOptions(), animations: {
+            UIView.animate(withDuration: 0.7, delay: 0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: UIView.AnimationOptions(), animations: {
                 let w: CGFloat = v.frame.size.width
                 let h: CGFloat = v.frame.size.height
                 let frame = CGRect(x: screenLoc.x - (w/2), y: screenLoc.y - (h/2), width: w, height: h)

diff --git a/Examples/Examples/BarsExample.swift b/Examples/Examples/BarsExample.swift
@@ -111,9 +111,9 @@ class BarsExample: UIViewController {
             self.controller = controller
 
             horizontal = UIButton()
-            horizontal.setTitle("Horizontal", for: UIControlState())
+            horizontal.setTitle("Horizontal", for: UIControl.State())
             vertical = UIButton()
-            vertical.setTitle("Vertical", for: UIControlState())
+            vertical.setTitle("Vertical", for: UIControl.State())
 
             buttonDirs = [horizontal : true, vertical : false]
 
@@ -124,7 +124,7 @@ class BarsExample: UIViewController {
 
             for button in [horizontal, vertical] {
                 button.titleLabel?.font = ExamplesDefaults.fontWithSize(14)
-                button.setTitleColor(UIColor.blue, for: UIControlState())
+                button.setTitleColor(UIColor.blue, for: UIControl.State())
                 button.addTarget(self, action: #selector(DirSelector.buttonTapped(_:)), for: .touchUpInside)
             }
         }
@@ -155,9 +155,9 @@ class BarsExample: UIViewController {
                 "\(str)-(\(buttonsSpace))-[\(tuple.0)]"
             }
 
-            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)}
+            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)}
 
-            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)
+            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)
                 + vConstraits)
         }
 

diff --git a/Examples/Examples/CandleStickInteractiveExample.swift b/Examples/Examples/CandleStickInteractiveExample.swift
@@ -78,9 +78,7 @@ class CandleStickInteractiveExample: UIViewController {
             let calendar = Calendar.current
             let monthDays = calendar.range(of: .day, in: .month, for: date)!
 
-            let arr = CountableRange<Int>(monthDays)
-
-            return arr.map {day in
+            return monthDays.map {day in
                 let date = dateWithComponents(day, month, year)
                 let axisValue = ChartAxisValueDate(date: date, formatter: displayFormatter, labelSettings: labelSettings)
                 axisValue.hidden = !(day % 5 == 0)
@@ -252,9 +250,9 @@ private class InfoView: UIView {
             "\(str)-(\(labelsSpace))-[\(tuple.0)]"
         }
 
-        let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|-(18)-[\($0.0)(\(circleDiameter))]", options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)}
+        let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|-(18)-[\($0.0)(\(circleDiameter))]", options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)}
 
-        addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)
+        addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)
             + vConstraits)
 
     }

diff --git a/Examples/Examples/GroupedAndStackedBarsExample.swift b/Examples/Examples/GroupedAndStackedBarsExample.swift
@@ -170,9 +170,9 @@ class GroupedAndStackedBarsExample: UIViewController {
             self.controller = controller
 
             horizontal = UIButton()
-            horizontal.setTitle("Horizontal", for: UIControlState())
+            horizontal.setTitle("Horizontal", for: UIControl.State())
             vertical = UIButton()
-            vertical.setTitle("Vertical", for: UIControlState())
+            vertical.setTitle("Vertical", for: UIControl.State())
 
             buttonDirs = [horizontal: true, vertical: false]
 
@@ -183,7 +183,7 @@ class GroupedAndStackedBarsExample: UIViewController {
 
             for button in [horizontal, vertical] {
                 button.titleLabel?.font = ExamplesDefaults.fontWithSize(14)
-                button.setTitleColor(UIColor.blue, for: UIControlState())
+                button.setTitleColor(UIColor.blue, for: UIControl.State())
                 button.addTarget(self, action: #selector(DirSelector.buttonTapped(_:)), for: .touchUpInside)
             }
         }
@@ -214,9 +214,9 @@ class GroupedAndStackedBarsExample: UIViewController {
                 "\(str)-(\(buttonsSpace))-[\(tuple.0)]"
             }
 
-            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)}
+            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)}
 
-            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)
+            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)
                 + vConstraits)
         }
 

diff --git a/Examples/Examples/GroupedBarsExample.swift b/Examples/Examples/GroupedBarsExample.swift
@@ -151,9 +151,9 @@ class GroupedBarsExample: UIViewController {
             self.controller = controller
 
             horizontal = UIButton()
-            horizontal.setTitle("Horizontal", for: UIControlState())
+            horizontal.setTitle("Horizontal", for: UIControl.State())
             vertical = UIButton()
-            vertical.setTitle("Vertical", for: UIControlState())
+            vertical.setTitle("Vertical", for: UIControl.State())
 
             buttonDirs = [horizontal : true, vertical : false]
 
@@ -164,7 +164,7 @@ class GroupedBarsExample: UIViewController {
 
             for button in [horizontal, vertical] {
                 button.titleLabel?.font = ExamplesDefaults.fontWithSize(14)
-                button.setTitleColor(UIColor.blue, for: UIControlState())
+                button.setTitleColor(UIColor.blue, for: UIControl.State())
                 button.addTarget(self, action: #selector(DirSelector.buttonTapped(_:)), for: .touchUpInside)
             }
         }
@@ -195,9 +195,9 @@ class GroupedBarsExample: UIViewController {
                 "\(str)-(\(buttonsSpace))-[\(tuple.0)]"
             }
 
-            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)}
+            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)}
 
-            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)
+            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)
                 + vConstraits)
         }
 

diff --git a/Examples/Examples/NotificationsExample.swift b/Examples/Examples/NotificationsExample.swift
@@ -46,7 +46,7 @@ class NotificationsExample: UIViewController {
                 label.transform = CGAffineTransform(scaleX: 0, y: 0)
 
                 chartPointView.movedToSuperViewHandler = {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: UIViewAnimationOptions(), animations: {
+                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: UIView.AnimationOptions(), animations: {
                         label.transform = CGAffineTransform(scaleX: 1, y: 1)
                     }, completion: nil)
                 }
@@ -58,8 +58,8 @@ class NotificationsExample: UIViewController {
                     let ok = "Ok"
 
                         if #available(iOS 8.0, *) {
-                            let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert)
-                            alert.addAction(UIAlertAction(title: ok, style: UIAlertActionStyle.default, handler: nil))
+                            let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.Style.alert)
+                            alert.addAction(UIAlertAction(title: ok, style: UIAlertAction.Style.default, handler: nil))
                             self!.present(alert, animated: true, completion: nil)
 
                         } else {

diff --git a/Examples/Examples/RangedAxisExample.swift b/Examples/Examples/RangedAxisExample.swift
@@ -22,7 +22,7 @@ class RangedAxisExample: UIViewController {
 
         view.backgroundColor = UIColor.black
 
-        NotificationCenter.default.addObserver(self, selector: #selector(rotated), name: NSNotification.Name.UIDeviceOrientationDidChange, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
     }
 
     private func initChart() {

diff --git a/Examples/Examples/StackedBarsExample.swift b/Examples/Examples/StackedBarsExample.swift
@@ -131,9 +131,9 @@ class StackedBarsExample: UIViewController {
             self.controller = controller
 
             self.horizontal = UIButton()
-            self.horizontal.setTitle("Horizontal", for: UIControlState())
+            self.horizontal.setTitle("Horizontal", for: UIControl.State())
             self.vertical = UIButton()
-            self.vertical.setTitle("Vertical", for: UIControlState())
+            self.vertical.setTitle("Vertical", for: UIControl.State())
 
             self.buttonDirs = [horizontal: true, vertical: false]
 
@@ -144,7 +144,7 @@ class StackedBarsExample: UIViewController {
 
             for button in [horizontal, vertical] {
                 button.titleLabel?.font = ExamplesDefaults.fontWithSize(14)
-                button.setTitleColor(UIColor.blue, for: UIControlState())
+                button.setTitleColor(UIColor.blue, for: UIControl.State())
                 button.addTarget(self, action: #selector(DirSelector.buttonTapped(_:)), for: .touchUpInside)
             }
         }
@@ -175,9 +175,9 @@ class StackedBarsExample: UIViewController {
                 "\(str)-(\(buttonsSpace))-[\(tuple.0)]"
             }
 
-            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)}
+            let vConstraits = namedViews.flatMap {NSLayoutConstraint.constraints(withVisualFormat: "V:|[\($0.0)]", options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)}
 
-            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutFormatOptions(), metrics: nil, views: viewsDict)
+            addConstraints(NSLayoutConstraint.constraints(withVisualFormat: hConstraintStr, options: NSLayoutConstraint.FormatOptions(), metrics: nil, views: viewsDict)
                 + vConstraits)
         }
 

diff --git a/Examples/MasterViewController.swift b/Examples/MasterViewController.swift
@@ -59,7 +59,7 @@ class MasterViewController: UITableViewController {
 
         navigationController?.navigationBar.titleTextAttributes = [.font : ExamplesDefaults.fontWithSize(22)]
         UIBarButtonItem.appearance().setTitleTextAttributes([.font : ExamplesDefaults.fontWithSize(22)],
-                                                            for: UIControlState())
+                                                            for: UIControl.State())
 
         if let split = splitViewController {
 

diff --git a/SwiftCharts.xcodeproj/project.pbxproj b/SwiftCharts.xcodeproj/project.pbxproj
@@ -980,7 +980,7 @@
 					06342AC01B8AAD7F001C9F5D = {
 						CreatedOnToolsVersion = 6.4;
 						DevelopmentTeam = 37QAPDY2PR;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 					};
 					06405DA51B8AA74700A689FF = {
 						CreatedOnToolsVersion = 6.4;
@@ -1386,7 +1386,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schuetz.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1402,7 +1402,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schuetz.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/SwiftCharts/Axis/ChartAxis.swift b/SwiftCharts/Axis/ChartAxis.swift
@@ -25,8 +25,8 @@ open class ChartAxis: CustomStringConvertible {
     open internal(set) var firstVisibleScreen: CGFloat
     open internal(set) var lastVisibleScreen: CGFloat
 
-    open let paddingFirstScreen: CGFloat
-    open let paddingLastScreen: CGFloat
+    public let paddingFirstScreen: CGFloat
+    public let paddingLastScreen: CGFloat
 
     /// Optional fixed padding value which overwrites paddingFirstScreen/paddingLastScreen when determining if model values are in bounds. This is useful e.g. when setting an initial zoom level, and scaling the padding proportionally such that it appears constant for different zoom levels. In this case it may be necessary to store the un-scaled padding in these variables to keep the bounds constant.
     open var fixedPaddingFirstScreen: CGFloat?

diff --git a/SwiftCharts/Axis/ChartAxisLabel.swift b/SwiftCharts/Axis/ChartAxisLabel.swift
@@ -12,9 +12,9 @@ import UIKit
 open class ChartAxisLabel {
 
     /// Displayed text. Can be truncated.
-    open let text: String
+    public let text: String
 
-    open let settings: ChartLabelSettings
+    public let settings: ChartLabelSettings
 
     open fileprivate(set) var originalText: String
 

diff --git a/SwiftCharts/Axis/ChartAxisLabelGeneratorDate.swift b/SwiftCharts/Axis/ChartAxisLabelGeneratorDate.swift
@@ -10,9 +10,9 @@ import UIKit
 
 open class ChartAxisLabelsGeneratorDate: ChartAxisLabelsGeneratorBase {
 
-    open let labelSettings: ChartLabelSettings
+    public let labelSettings: ChartLabelSettings
 
-    open let formatter: DateFormatter
+    public let formatter: DateFormatter
 
     public init(labelSettings: ChartLabelSettings, formatter: DateFormatter = ChartAxisLabelsGeneratorDate.defaultFormatter) {
         self.labelSettings = labelSettings

diff --git a/SwiftCharts/Axis/ChartAxisLabelsGeneratorBasic.swift b/SwiftCharts/Axis/ChartAxisLabelsGeneratorBasic.swift
@@ -11,7 +11,7 @@ import Foundation
 /// Generates a single unformatted label for scalar
 open class ChartAxisLabelsGeneratorBasic: ChartAxisLabelsGeneratorBase {
 
-    open let labelSettings: ChartLabelSettings
+    public let labelSettings: ChartLabelSettings
 
     public init(labelSettings: ChartLabelSettings) {
         self.labelSettings = labelSettings

diff --git a/SwiftCharts/Axis/ChartAxisLabelsGeneratorFixed.swift b/SwiftCharts/Axis/ChartAxisLabelsGeneratorFixed.swift
@@ -10,7 +10,7 @@ import Foundation
 
 open class ChartAxisLabelsGeneratorFixed: ChartAxisLabelsGeneratorBase {
 
-    open let dict: [Double: [ChartAxisLabel]]
+    public let dict: [Double: [ChartAxisLabel]]
 
     public convenience init(axisValues: [ChartAxisValue]) {
         var dict = [Double: [ChartAxisLabel]]()
@@ -34,4 +34,4 @@ open class ChartAxisLabelsGeneratorFixed: ChartAxisLabelsGeneratorBase {
     open override func fonts(_ scalar: Double) -> [UIFont] {
         return dict[scalar].map {labels in labels.map{$0.settings.font}} ?? []
     }
-}
+}
diff --git a/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumber.swift b/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumber.swift
@@ -11,9 +11,9 @@ import Foundation
 /// Generates a single formatted number for scalar
 open class ChartAxisLabelsGeneratorNumber: ChartAxisLabelsGeneratorBase {
 
-    open let labelSettings: ChartLabelSettings
+    public let labelSettings: ChartLabelSettings
 
-    open let formatter: NumberFormatter
+    public let formatter: NumberFormatter
 
     public init(labelSettings: ChartLabelSettings, formatter: NumberFormatter = ChartAxisLabelsGeneratorNumber.defaultFormatter) {
         self.labelSettings = labelSettings

diff --git a/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumberSuffix.swift b/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumberSuffix.swift
@@ -37,11 +37,11 @@ public enum ChartAxisLabelNumberSuffixUnit {
 
 open class ChartAxisLabelsGeneratorNumberSuffix: ChartAxisLabelsGeneratorBase {
 
-    open let labelSettings: ChartLabelSettings
+    public let labelSettings: ChartLabelSettings
 
-    open let startUnit: ChartAxisLabelNumberSuffixUnit
+    public let startUnit: ChartAxisLabelNumberSuffixUnit
 
-    open let formatter: NumberFormatter
+    public let formatter: NumberFormatter
 
     public init(labelSettings: ChartLabelSettings, startUnit: ChartAxisLabelNumberSuffixUnit = .m, formatter: NumberFormatter = ChartAxisLabelsGeneratorNumberSuffix.defaultFormatter) {
         self.labelSettings = labelSettings

diff --git a/SwiftCharts/Axis/ChartAxisLayerDefault.swift b/SwiftCharts/Axis/ChartAxisLayerDefault.swift
@@ -123,7 +123,7 @@ open class ChartAxisLayerDefault: ChartAxisLayer {
 
     open var currentAxisValues: [Double] = []
 
-    open let valuesGenerator: ChartAxisValuesGenerator
+    public let valuesGenerator: ChartAxisValuesGenerator
     open var labelsGenerator: ChartAxisLabelsGenerator
 
     let axisTitleLabels: [ChartAxisLabel]

diff --git a/SwiftCharts/Axis/ChartAxisValuesGeneratorFixedNonOverlapping.swift b/SwiftCharts/Axis/ChartAxisValuesGeneratorFixedNonOverlapping.swift
@@ -10,11 +10,11 @@ import UIKit
 
 open class ChartAxisValuesGeneratorFixedNonOverlapping: ChartAxisValuesGeneratorFixed {
 
-    open let axisValues: [ChartAxisValue]
+    public let axisValues: [ChartAxisValue]
 
-    open let maxLabelSize: CGSize
-    open let totalLabelSize: CGSize
-    open let spacing: CGFloat
+    public let maxLabelSize: CGSize
+    public let totalLabelSize: CGSize
+    public let spacing: CGFloat
 
     fileprivate var isX: Bool
 
@@ -60,4 +60,4 @@ open class ChartAxisValuesGeneratorFixedNonOverlapping: ChartAxisValuesGenerator
 
         return filteredAxisValues
     }
-}
+}
diff --git a/SwiftCharts/AxisValues/ChartAxisValue.swift b/SwiftCharts/AxisValues/ChartAxisValue.swift
@@ -15,9 +15,9 @@ import UIKit
 open class ChartAxisValue: Equatable, Hashable, CustomStringConvertible {
 
     /// The backing value for all other types of axis values
-    open let scalar: Double
-    open let labelSettings: ChartLabelSettings
-    open var hidden = false
+    public let scalar: Double
+    public let labelSettings: ChartLabelSettings
+    public var hidden = false
 
     /// The labels that will be displayed in the chart
     open var labels: [ChartAxisLabel] {