From 3af939e54523338416c56e76a4b3111968939b4a Mon Sep 17 00:00:00 2001 From: Luke Redpath Date: Sat, 14 May 2022 00:09:16 +0100 Subject: [PATCH 1/2] Fixes protocol implementation when compiled with Swift 5.7 --- .gitignore | 1 + Package.resolved | 8 ++++---- .../Data/Implementations/Standard/ChartDataSet.swift | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c49c6a1c26..7d2c65a0c7 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ DerivedData *.ipa *.dSYM.zip *.dSYM +*.dia ## Playgrounds timeline.xctimeline diff --git a/Package.resolved b/Package.resolved index 27daaabac3..888ca3b156 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/apple/swift-algorithms", "state": { "branch": null, - "revision": "bb3bafeca0e164ece3403a9de646b7d38c07dd49", - "version": "0.0.2" + "revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e", + "version": "1.0.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/apple/swift-numerics", "state": { "branch": null, - "revision": "6b24333510e9044cf4716a07bed65eeed6bc6393", - "version": "0.0.8" + "revision": "0a5bc04095a675662cf24757cc0640aa2204253b", + "version": "1.0.2" } } ] diff --git a/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift index 70d2da5582..bb3637aa7b 100644 --- a/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift +++ b/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift @@ -435,6 +435,12 @@ extension ChartDataSet: RandomAccessCollection { // MARK: RangeReplaceableCollection extension ChartDataSet: RangeReplaceableCollection { + public func replaceSubrange(_ subrange: Swift.Range, with newElements: C) where C : Collection, Element == C.Element + { + entries.replaceSubrange(subrange, with: newElements) + notifyDataSetChanged() + } + public func append(_ newElement: Element) { calcMinMax(entry: newElement) entries.append(newElement) From be742eb31e9611d40f136246e7750edb4c7949ac Mon Sep 17 00:00:00 2001 From: Luke Redpath Date: Sat, 14 May 2022 00:15:14 +0100 Subject: [PATCH 2/2] Fix warnings --- Source/Charts/Utils/ChartUtils.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Charts/Utils/ChartUtils.swift b/Source/Charts/Utils/ChartUtils.swift index 10fa091c85..3103fac6c3 100644 --- a/Source/Charts/Utils/ChartUtils.swift +++ b/Source/Charts/Utils/ChartUtils.swift @@ -119,7 +119,7 @@ extension CGPoint extension CGContext { - open func drawImage(_ image: NSUIImage, atCenter center: CGPoint, size: CGSize) + public func drawImage(_ image: NSUIImage, atCenter center: CGPoint, size: CGSize) { var drawOffset = CGPoint() drawOffset.x = center.x - (size.width / 2) @@ -157,7 +157,7 @@ extension CGContext NSUIGraphicsPopContext() } - open func drawText(_ text: String, at point: CGPoint, align: TextAlignment, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat = 0.0, attributes: [NSAttributedString.Key : Any]?) + public func drawText(_ text: String, at point: CGPoint, align: TextAlignment, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat = 0.0, attributes: [NSAttributedString.Key : Any]?) { let drawPoint = getDrawPoint(text: text, point: point, align: align, attributes: attributes) @@ -175,7 +175,7 @@ extension CGContext } } - open func drawText(_ text: String, at point: CGPoint, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat, attributes: [NSAttributedString.Key : Any]?) + public func drawText(_ text: String, at point: CGPoint, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat, attributes: [NSAttributedString.Key : Any]?) { var drawOffset = CGPoint()