Merge pull request #3864 from danielgindi/fix-objc-imports-anyobject

Replace AnyObject with Any
ChartsOrg · Mar 6, 2019 · fe66742 · fe66742
2 parents ad26e63 + 46a3018
commit fe66742
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift b/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift
@@ -25,7 +25,7 @@ open class BalloonMarker: MarkerImage
     fileprivate var label: String?
     fileprivate var _labelSize: CGSize = CGSize()
     fileprivate var _paragraphStyle: NSMutableParagraphStyle?
-    fileprivate var _drawAttributes = [NSAttributedString.Key : AnyObject]()
+    fileprivate var _drawAttributes = [NSAttributedString.Key : Any]()
 
     @objc public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
     {

diff --git a/ChartsDemo-iOS/Swift/Components/BalloonMarker.swift b/ChartsDemo-iOS/Swift/Components/BalloonMarker.swift
@@ -24,7 +24,7 @@ open class BalloonMarker: MarkerImage
     fileprivate var label: String?
     fileprivate var _labelSize: CGSize = CGSize()
     fileprivate var _paragraphStyle: NSMutableParagraphStyle?
-    fileprivate var _drawAttributes = [NSAttributedString.Key : AnyObject]()
+    fileprivate var _drawAttributes = [NSAttributedString.Key : Any]()
 
     public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
     {

diff --git a/ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift
@@ -54,7 +54,7 @@ open class BarDemoViewController: NSViewController
         self.barChartView.chartDescription?.text = "Barchart Demo"
     }
 
-    @IBAction func save(_ sender: AnyObject)
+    @IBAction func save(_ sender: Any)
     {
         let panel = NSSavePanel()
         panel.allowedFileTypes = ["png"]

diff --git a/Source/Charts/Utils/Platform.swift b/Source/Charts/Utils/Platform.swift
@@ -245,9 +245,9 @@ public typealias NSUIGestureRecognizerState = UIGestureRecognizer.State
             return _timestamp
         }
 
-		init(target: AnyObject, selector: Selector)
+		init(target: Any, selector: Selector)
         {
-            _target = target
+            _target = target as AnyObject
             _selector = selector
 
             if CVDisplayLinkCreateWithActiveCGDisplays(&displayLink) == kCVReturnSuccess