Merge conflict with podspec version

mchoe · Mar 31, 2019 · f0e5801 · f0e5801
2 parents 5be877a + a82893b
commit f0e5801
Show file tree

Hide file tree

Showing 28 changed files with 175 additions and 890 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/README.md b/README.md
@@ -36,6 +36,11 @@ Table of Contents
 Install
 =======
 
+| Swift version | SwiftSVG version                                                |
+| ------------- | ----------------------------------------------------------- |
+| Swift 5.0     | v2.3.0                                                      |
+| Swift 4.2     | v2.2.1                                                      |
+
 Cocoapods:
 
     pod 'SwiftSVG', '~> 2.0'

diff --git a/SwiftSVG.podspec b/SwiftSVG.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s| 
 
   s.name         = "SwiftSVG"
-  s.version      = "2.2.1"
+  s.version      = "2.3.0"
   s.summary      = "A simple, performant, single pass SVG parser"
   s.description  = "A simple, performant, single pass SVG parser. Optimized for extension and developer joy."
   s.homepage     = "https://github.com/mchoe/SwiftSVG"
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.source       = { :git => "https://github.com/mchoe/SwiftSVG.git", :tag => "v#{s.version}" }
   s.source_files  = "SwiftSVG", "SwiftSVG/**/*.{h,swift}"
-  s.swift_version = "4.2"
+  s.swift_version = "5.0"
 end
diff --git a/SwiftSVG.xcodeproj/project.pbxproj b/SwiftSVG.xcodeproj/project.pbxproj
@@ -563,7 +563,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Strauss LLC";
 				TargetAttributes = {
 					176BC98F1EE474D100F7B54C = {
@@ -572,7 +572,7 @@
 					};
 					39B8D88B1B3C3283009DAF60 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -581,6 +581,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -836,8 +837,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator appletvsimulator appletvos iphoneos macosx";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -864,8 +864,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator appletvsimulator appletvos iphoneos macosx";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -876,6 +875,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -937,6 +937,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;

diff --git a/SwiftSVG.xcodeproj/xcshareddata/xcschemes/SwiftSVG.xcscheme b/SwiftSVG.xcodeproj/xcshareddata/xcschemes/SwiftSVG.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SwiftSVG/NSBezierPath+CrossPlatform.swift b/SwiftSVG/NSBezierPath+CrossPlatform.swift
@@ -54,15 +54,15 @@ public extension NSBezierPath {
         }
     }
 
-    public func addLine(to point: NSPoint) {
+    func addLine(to point: NSPoint) {
         self.line(to: point)
     }
 
-    public func addCurve(to point: NSPoint, controlPoint1: NSPoint, controlPoint2: NSPoint) {
+    func addCurve(to point: NSPoint, controlPoint1: NSPoint, controlPoint2: NSPoint) {
         self.curve(to: point, controlPoint1: controlPoint1, controlPoint2: controlPoint2)
     }
 
-    public func addQuadCurve(to point: NSPoint, controlPoint: NSPoint) {
+    func addQuadCurve(to point: NSPoint, controlPoint: NSPoint) {
         self.curve(to: point,
                    controlPoint1: NSPoint(
                     x: (controlPoint.x - self.currentPoint.x) * (2.0 / 3.0) + self.currentPoint.x,

diff --git a/SwiftSVG/SVG Extensions/CALayer+SVG.swift b/SwiftSVG/SVG Extensions/CALayer+SVG.swift
@@ -51,7 +51,7 @@ public extension CALayer {
      - Parameter completion: A required completion block to execute once the SVG has completed parsing. You must add the passed `SVGLayer` to a sublayer to display it.
      */
     @discardableResult
-    public convenience init(SVGURL: URL, parser: SVGParser? = nil, completion: @escaping (SVGLayer) -> ()) {
+    convenience init(SVGURL: URL, parser: SVGParser? = nil, completion: @escaping (SVGLayer) -> ()) {
         do {
             let svgData = try Data(contentsOf: SVGURL)
             self.init(SVGData: svgData, parser: parser, completion: completion)
@@ -67,7 +67,7 @@ public extension CALayer {
      - Parameter completion: A required completion block to execute once the SVG has completed parsing. You must add the passed `SVGLayer` to a sublayer to display it.
      */
     @discardableResult
-    public convenience init(SVGData: Data, parser: SVGParser? = nil, completion: @escaping (SVGLayer) -> ()) {
+    convenience init(SVGData: Data, parser: SVGParser? = nil, completion: @escaping (SVGLayer) -> ()) {
         self.init()
 
         if let cached = SVGCache.default[SVGData.cacheKey] {

diff --git a/SwiftSVG/SVG Extensions/CAShapeLayer+SVG.swift b/SwiftSVG/SVG Extensions/CAShapeLayer+SVG.swift
@@ -42,7 +42,7 @@ public extension CAShapeLayer {
      Convenience initalizer that synchronously parses a single path string and returns a `CAShapeLayer`
      - Parameter pathString: The path `d` string to parse.
      */
-    public convenience init(pathString: String) {
+    convenience init(pathString: String) {
         self.init()
         let singlePath = SVGPath(singlePathString: pathString)
         self.path = singlePath.svgLayer.path

diff --git a/SwiftSVG/SVG Extensions/SVGLayer.swift b/SwiftSVG/SVG Extensions/SVGLayer.swift
@@ -49,7 +49,7 @@ public extension SVGLayerType where Self: CALayer {
      - TODO: Should eventually support different content modes
      */
     @discardableResult
-    public func resizeToFit(_ rect: CGRect) -> Self {
+    func resizeToFit(_ rect: CGRect) -> Self {
 
         let boundingBoxAspectRatio = self.boundingBox.width / self.boundingBox.height
         let viewAspectRatio = rect.width / rect.height
@@ -86,7 +86,7 @@ public extension SVGLayer {
     /**
      Returns a copy of the given SVGLayer
      */
-    public var svgLayerCopy: SVGLayer? {
+    var svgLayerCopy: SVGLayer? {
         let tmp = NSKeyedArchiver.archivedData(withRootObject: self)
         let copiedLayer = NSKeyedUnarchiver.unarchiveObject(with: tmp) as? SVGLayer
         copiedLayer?.boundingBox = self.boundingBox

diff --git a/SwiftSVG/SVG Extensions/UIBezierPath+SVG.swift b/SwiftSVG/SVG Extensions/UIBezierPath+SVG.swift
@@ -44,7 +44,7 @@ public extension UIBezierPath {
      Parses a single path string. Parses synchronously.
      - Parameter pathString: The path `d` string to parse.
      */
-    public convenience init(pathString: String) {
+    convenience init(pathString: String) {
         let singlePath = SVGPath(singlePathString: pathString)
         guard let cgPath = singlePath.svgLayer.path else {
             self.init()
@@ -59,7 +59,7 @@ public extension UIBezierPath {
 
 
     @available(*, deprecated, message: "This method is deprecated. If you want to parse a single path, instantiate a new instance of SVGPath using the SVGPath(singlePathString:) initializer and pass the path string.")
-    public class func pathWithSVGURL(_ SVGURL: URL) -> UIBezierPath? {
+    class func pathWithSVGURL(_ SVGURL: URL) -> UIBezierPath? {
         assert(false, "This method is deprecated")
         return nil
     }

diff --git a/SwiftSVG/SVG Extensions/UIView+SVG.swift b/SwiftSVG/SVG Extensions/UIView+SVG.swift
@@ -48,7 +48,7 @@ public extension UIView {
      ```
      - Parameter pathString: The path `d` string to parse.
      */
-    public convenience init(pathString: String) {
+    convenience init(pathString: String) {
         self.init()
         let svgLayer = SVGLayer()
         let pathPath = UIBezierPath(pathString: pathString)
@@ -69,7 +69,7 @@ public extension UIView {
      - Parameter parser: The optional parser to use to parse the SVG file
      - Parameter completion: A required completion block to execute once the SVG has completed parsing. The passed `SVGLayer` will be added to this view's sublayers before executing the completion block
      */
-    public convenience init(SVGNamed: String, parser: SVGParser? = nil, completion: ((SVGLayer) -> ())? = nil) {
+    convenience init(SVGNamed: String, parser: SVGParser? = nil, completion: ((SVGLayer) -> ())? = nil) {
 
         // TODO: This is too many guards to really make any sense. Also approaching on the
         // pyramid of death Refactor this at some point to be able to work cross-platform.
@@ -129,7 +129,7 @@ public extension UIView {
      - Parameter parser: The optional parser to use to parse the SVG file
      - Parameter completion: A required completion block to execute once the SVG has completed parsing. The passed `SVGLayer` will be added to this view's sublayers before executing the completion block
      */
-    public convenience init(SVGURL: URL, parser: SVGParser? = nil, completion: ((SVGLayer) -> ())? = nil) {
+    convenience init(SVGURL: URL, parser: SVGParser? = nil, completion: ((SVGLayer) -> ())? = nil) {
         do {
             let svgData = try Data(contentsOf: SVGURL)
             self.init(SVGData: svgData, parser: parser, completion: completion)
@@ -150,7 +150,7 @@ public extension UIView {
      - Parameter parser: The optional parser to use to parse the SVG file
      - Parameter completion: A required completion block to execute once the SVG has completed parsing. The passed `SVGLayer` will be added to this view's sublayers before executing the completion block
      */
-	public convenience init(SVGData svgData: Data, parser: SVGParser? = nil, completion: ((SVGLayer) -> ())? = nil) {
+    convenience init(SVGData svgData: Data, parser: SVGParser? = nil, completion: ((SVGLayer) -> ())? = nil) {
 		self.init()
 
         CALayer(SVGData: svgData, parser: parser) { [weak self] (svgLayer) in

diff --git a/SwiftSVG/SVG/Elements/SVGGroup.swift b/SwiftSVG/SVG/Elements/SVGGroup.swift
@@ -100,7 +100,7 @@ fileprivate extension SVGGroup {
     /**
      Function that applies the fill color on all of this group's subelements
      */
-    fileprivate func fillGroup(_ fillColor: String, on layer: CAShapeLayer) {
+    func fillGroup(_ fillColor: String, on layer: CAShapeLayer) {
         guard let fillColor = UIColor(svgString: fillColor) else {
             return
         }
@@ -110,7 +110,7 @@ fileprivate extension SVGGroup {
     /**
      Function that applies the fill rule on all of this group's subelements
      */
-    fileprivate func fillRuleGroup(_ fillRule: String, on layer: CAShapeLayer) {
+    func fillRuleGroup(_ fillRule: String, on layer: CAShapeLayer) {
         guard fillRule == "evenodd" else {
             return
         }
@@ -120,7 +120,7 @@ fileprivate extension SVGGroup {
     /**
      Function that applies the fill opacity on all of this group's subelements
      */
-    fileprivate func fillOpacityGroup(_ opacity: String, on layer: CAShapeLayer) {
+    func fillOpacityGroup(_ opacity: String, on layer: CAShapeLayer) {
         guard let opacity = Float(opacity) else {
             return
         }
@@ -134,14 +134,14 @@ fileprivate extension SVGGroup {
     /**
      Function that applies the stroke line cap on all of this group's subelements
      */
-    fileprivate func strokeLineCapGroup(lineCap: String, on layer: CAShapeLayer) {
+    func strokeLineCapGroup(lineCap: String, on layer: CAShapeLayer) {
         layer.lineCap = CAShapeLayerLineCap(rawValue: lineCap)
     }
 
     /**
      Function that applies the stroke color on all of this group's subelements
      */
-    fileprivate func strokeColorGroup(strokeColor: String, on layer: CAShapeLayer) {
+    func strokeColorGroup(strokeColor: String, on layer: CAShapeLayer) {
         guard let strokeColor = UIColor(svgString: strokeColor) else {
             return
         }
@@ -151,14 +151,14 @@ fileprivate extension SVGGroup {
     /**
      Function that applies the stroke line join on all of this group's subelements
      */
-    fileprivate func strokeLineJoinGroup(lineJoin: String, on layer: CAShapeLayer) {
+    func strokeLineJoinGroup(lineJoin: String, on layer: CAShapeLayer) {
         layer.lineJoin = CAShapeLayerLineJoin(rawValue: lineJoin)
     }
 
     /**
      Function that applies the miter limit on all of this group's subelements
      */
-    fileprivate func strokeMiterLimitGroup(miterLimit: String, on layer: CAShapeLayer) {
+    func strokeMiterLimitGroup(miterLimit: String, on layer: CAShapeLayer) {
         guard let miterLimit = CGFloat(miterLimit) else {
             return
         }
@@ -168,7 +168,7 @@ fileprivate extension SVGGroup {
     /**
      Function that applies the streoke width on all of this group's subelements
      */
-    fileprivate func strokeWidthGroup(strokeWidth: String, on layer: CAShapeLayer) {
+    func strokeWidthGroup(strokeWidth: String, on layer: CAShapeLayer) {
         guard let strokeWidth = CGFloat(strokeWidth) else {
             return
         }

diff --git a/SwiftSVG/SVG/Helpers/UIColor+Extensions.swift b/SwiftSVG/SVG/Helpers/UIColor+Extensions.swift
@@ -164,7 +164,7 @@ public extension UIColor {
      Convenience initializer that creates a new UIColor from a CSS3 named color
      - SeeAlso: See here for all the colors: [https://www.w3.org/TR/css3-color/#svg-color](https://www.w3.org/TR/css3-color/#svg-color)
      */
-    public convenience init?(named: String) {
+    convenience init?(named: String) {
         guard let namedColor = CGColor.named[named] else {
             return nil
         }

diff --git a/SwiftSVG/SVG/Iterators/PathCommand.swift b/SwiftSVG/SVG/Iterators/PathCommand.swift
@@ -93,7 +93,7 @@ internal extension PathCommand {
     /**
      Default implementation for any `PathCommand` indicating where there are enough coordinates stored to be able to process the `SVGElement`
      */
-    internal var canPushCommand: Bool {
+    var canPushCommand: Bool {
         if self.numberOfRequiredParameters == 0 {
             return true
         }
@@ -109,21 +109,21 @@ internal extension PathCommand {
     /**
      Function that clears the current number buffer
      */
-    internal mutating func clearBuffer() {
+    mutating func clearBuffer() {
         self.coordinateBuffer.removeAll()
     }
 
     /**
      Adds a new coordinate to the buffer
      */
-    internal mutating func pushCoordinate(_ coordinate: Double) {
+    mutating func pushCoordinate(_ coordinate: Double) {
         self.coordinateBuffer.append(coordinate)
     }
 
     /**
      Based on the `PathType` of this PathCommand, this function returns the relative or absolute point
      */
-    internal func pointForPathType(_ point: CGPoint, relativeTo: CGPoint) -> CGPoint {
+    func pointForPathType(_ point: CGPoint, relativeTo: CGPoint) -> CGPoint {
         switch self.pathType {
         case .absolute:
             return point