Merge pull request #10 from danielgindi/master

SPM GitHub Action (ChartsOrg#4553)
ccworld1000 · Jan 13, 2021 · 7891a36 · 7891a36
2 parents 404d397 + dea1cc5
commit 7891a36
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 245 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -0,0 +1,17 @@
+name: Swift
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: swift build -v
diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift
@@ -9,11 +9,13 @@
 //  https://github.com/danielgindi/Charts
 //
 
-import Foundation
 import CoreGraphics
+import Foundation
 
-#if !os(OSX)
-    import UIKit
+#if canImport(UIKit)
+import UIKit
+#elseif canImport(AppKit)
+import AppKit
 #endif
 
 /// Base-class of LineChart, BarChart, ScatterChart and CandleStickChart.
@@ -905,7 +907,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
 
     #if !os(OSX)
-    open override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool
+    open override func gestureRecognizerShouldBegin(_ gestureRecognizer: NSUIGestureRecognizer) -> Bool
     {
         if !super.gestureRecognizerShouldBegin(gestureRecognizer)
         {
@@ -917,7 +919,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     #endif
 
     #if os(OSX)
-    public func gestureRecognizerShouldBegin(gestureRecognizer: NSGestureRecognizer) -> Bool
+    public func gestureRecognizerShouldBegin(gestureRecognizer: NSUIGestureRecognizer) -> Bool
     {
         return nsuiGestureRecognizerShouldBegin(gestureRecognizer)
     }

diff --git a/Source/Charts/Charts/ChartViewBase.swift b/Source/Charts/Charts/ChartViewBase.swift
@@ -104,7 +104,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     @objc open var noDataTextColor: NSUIColor = .labelOrBlack
 
     /// alignment of the no data text
-    @objc open var noDataTextAlignment: NSTextAlignment = .left
+    @objc open var noDataTextAlignment: TextAlignment = .left
 
     /// The renderer object responsible for rendering / drawing the Legend.
     @objc open lazy var legendRenderer = LegendRenderer(viewPortHandler: viewPortHandler, legend: legend)
@@ -276,7 +276,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
             context.saveGState()
             defer { context.restoreGState() }
 
-            let paragraphStyle = NSMutableParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
+            let paragraphStyle = MutableParagraphStyle.default.mutableCopy() as! MutableParagraphStyle
             paragraphStyle.minimumLineHeight = noDataFont.lineHeight
             paragraphStyle.lineBreakMode = .byWordWrapping
             paragraphStyle.alignment = noDataTextAlignment

diff --git a/Source/Charts/Charts/PieChartView.swift b/Source/Charts/Charts/PieChartView.swift
@@ -417,7 +417,7 @@ open class PieChartView: PieRadarChartViewBase
             }
             else
             {
-                let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
+                let paragraphStyle = ParagraphStyle.default.mutableCopy() as! MutableParagraphStyle
                 paragraphStyle.lineBreakMode = .byTruncatingTail
                 paragraphStyle.alignment = .center
 

diff --git a/Source/Charts/Components/Description.swift b/Source/Charts/Components/Description.swift
@@ -44,7 +44,7 @@ open class Description: ComponentBase
     open var position: CGPoint? = nil
 
     /// The text alignment of the description text. Default RIGHT.
-    @objc open var textAlign: NSTextAlignment = NSTextAlignment.right
+    @objc open var textAlign: TextAlignment = TextAlignment.right
 
     /// Font object used for drawing the description text.
     @objc open var font: NSUIFont

diff --git a/Source/Charts/Components/MarkerView.swift b/Source/Charts/Components/MarkerView.swift
@@ -82,15 +82,14 @@ open class MarkerView: NSUIView, Marker
             options: nil)?[0] as? MarkerView
         #else
 
-        var loadedObjects = NSArray()
-        let loadedObjectsPointer = AutoreleasingUnsafeMutablePointer<NSArray?>(&loadedObjects)
+        var loadedObjects: NSArray? = NSArray()
 
         if bundle.loadNibNamed(
             NSNib.Name(String(describing: self)),
             owner: nil,
-            topLevelObjects: loadedObjectsPointer)
+            topLevelObjects: &loadedObjects)
         {
-            return loadedObjects[0] as? MarkerView
+            return loadedObjects?[0] as? MarkerView
         }
 
         return nil

diff --git a/Source/Charts/Components/YAxis.swift b/Source/Charts/Components/YAxis.swift
@@ -78,7 +78,7 @@ open class YAxis: AxisBase
     @objc open var labelPosition = LabelPosition.outsideChart
 
     /// the alignment of the text in the y-label
-    @objc open var labelAlignment: NSTextAlignment = .left
+    @objc open var labelAlignment: TextAlignment = .left
 
     /// the horizontal offset of the y-label
     @objc open var labelXOffset: CGFloat = 0.0

diff --git a/Source/Charts/Renderers/AxisRendererBase.swift b/Source/Charts/Renderers/AxisRendererBase.swift
diff --git a/Source/Charts/Renderers/BarChartRenderer.swift b/Source/Charts/Renderers/BarChartRenderer.swift
@@ -668,7 +668,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
     }
 
     /// Draws a value at the specified x and y position.
-    @objc open func drawValue(context: CGContext, value: String, xPos: CGFloat, yPos: CGFloat, font: NSUIFont, align: NSTextAlignment, color: NSUIColor, anchor: CGPoint, angleRadians: CGFloat)
+    @objc open func drawValue(context: CGContext, value: String, xPos: CGFloat, yPos: CGFloat, font: NSUIFont, align: TextAlignment, color: NSUIColor, anchor: CGPoint, angleRadians: CGFloat)
     {
         if (angleRadians == 0.0)
         {

diff --git a/Source/Charts/Renderers/HorizontalBarChartRenderer.swift b/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
@@ -324,7 +324,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 let barData = dataProvider.barData
                 else { return }
 
-            let textAlign = NSTextAlignment.left
+            let textAlign = TextAlignment.left
 
             let valueOffsetPlus: CGFloat = 5.0
             var posOffset: CGFloat

diff --git a/Source/Charts/Renderers/PieChartRenderer.swift b/Source/Charts/Renderers/PieChartRenderer.swift
@@ -408,7 +408,7 @@ open class PieChartRenderer: NSObject, DataRenderer
 
                     var pt2: CGPoint
                     var labelPoint: CGPoint
-                    var align: NSTextAlignment
+                    var align: TextAlignment
 
                     var line1Radius: CGFloat
 

diff --git a/Source/Charts/Renderers/XAxisRenderer.swift b/Source/Charts/Renderers/XAxisRenderer.swift
@@ -249,7 +249,7 @@ open class XAxisRenderer: NSObject, AxisRenderer
     {
         guard let transformer = self.transformer else { return }
 
-        let paraStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
+        let paraStyle = ParagraphStyle.default.mutableCopy() as! MutableParagraphStyle
         paraStyle.alignment = .center
 
         let labelAttrs: [NSAttributedString.Key : Any] = [.font: axis.labelFont,
@@ -453,7 +453,7 @@ open class XAxisRenderer: NSObject, AxisRenderer
 
         let xOffset: CGFloat = limitLine.lineWidth + limitLine.xOffset
 
-        let align: NSTextAlignment
+        let align: TextAlignment
         let point: CGPoint
 
         switch limitLine.labelPosition

diff --git a/Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift b/Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift
@@ -254,7 +254,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
                 let xOffset = 4.0 + l.xOffset
                 let yOffset = l.lineWidth + labelLineHeight + l.yOffset
 
-                let align: NSTextAlignment
+                let align: TextAlignment
                 let point: CGPoint
 
                 switch l.labelPosition