Upgrading to Swift 5, fixing warnings, cleanup for cocoapods

jeffMeador · jeffMeador · commit b7fa9551a637 · 2020-03-23T13:53:32.000-04:00
diff --git a/.swift-version b/.swift-version
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ platform :ios, '10.0'
 use_frameworks!
 
 target '<Your Target Name>' do
-    pod 'Texty', '~> 0.2.3'
+    pod 'Texty', '~> 0.2.6'
 end
 ```
 
@@ -53,7 +53,7 @@ $ brew install carthage
 
 To integrate Texty into your Xcode project using Carthage, specify it in your `Cartfile`:
 ```ogdl
-github "Vectorform/Texty" ~> 0.2.3
+github "Vectorform/Texty" ~> 0.2.6
 ```
 
 Run `carthage update` to build the framework and drag the built `Texty.framework` into your Xcode project.
diff --git a/Source/Scanner.swift b/Source/Scanner.swift
@@ -32,30 +32,30 @@ import Foundation
 internal extension Scanner {
     
     
-    internal func incrementLocation() {
+    func incrementLocation() {
         guard !self.isAtEnd else {
             return
         }
         self.scanLocation += 1 
     }
     
-    internal func scan(upto string: String) -> String? {
+    func scan(upto string: String) -> String? {
         var ptr: NSString? = ""
         guard self.scanUpTo(string, into: &ptr) || ((!self.isAtEnd) && ((self.string as NSString).substring(from: self.scanLocation).hasPrefix(string))) else {
             return nil
         }
         return ptr as String?
     }
     
-    internal func scanUpToString(_ string: String) -> String? {
+    func scanUpToString(_ string: String) -> String? {
         var ptr: NSString? = ""
         guard self.scanUpTo(string, into: &ptr) || (!self.isAtEnd) else {
             return nil
         }
         return ptr as String?
     }
     
-    internal func scanUpToCharacters(_ characterSet: CharacterSet) -> String? {
+    func scanUpToCharacters(_ characterSet: CharacterSet) -> String? {
         var ptr: NSString? = ""
         guard self.scanUpToCharacters(from: characterSet, into: &ptr) || (!self.isAtEnd) else {
             return nil
diff --git a/Source/String.swift b/Source/String.swift
@@ -70,7 +70,7 @@ internal extension String {
     }
     
     
-    internal mutating func findAndRemoveTags() -> [(tag: String, range: NSRange)] {
+    mutating func findAndRemoveTags() -> [(tag: String, range: NSRange)] {
         let scanner: Scanner = Scanner(string: self)
         
         var tagLocation: Int
@@ -142,7 +142,7 @@ internal extension String {
             
             //The tag is closing, and we need to find the first opening tag for it
             //== compares Tag.name properties only
-            guard let index = openTags.index(of: tag) else {
+            guard let index = openTags.firstIndex(of: tag) else {
                 assertionFailure("Texty: closing tag found without opening tag (unbalanced tags found in string)")
                 continue
             }
@@ -161,7 +161,7 @@ internal extension String {
     }
 
     
-    internal mutating func stripTags() -> [String : NSRange] {
+    mutating func stripTags() -> [String : NSRange] {
         let scanner: Scanner = Scanner(string: self)
         var tags: [String : NSRange] = [:]
         var locationOffset: Int = 0
diff --git a/Source/Tag.swift b/Source/Tag.swift
@@ -40,8 +40,9 @@ internal struct Tag: Hashable {
     internal let name: String
     internal let location: Int
     
-    
-    public var hashValue: Int { return self.name.hashValue }
+    func hash(into hasher: inout Hasher) {
+        return self.name.hash(into: &hasher)
+    }
     
     
     public init(string: String, location: Int, closing: Bool, short: Bool) {
diff --git a/Source/TextStyle.swift b/Source/TextStyle.swift
@@ -109,112 +109,112 @@ public class TextStyle {
 }
 
 public extension TextStyle {
-    public var attachment: NSTextAttachment? {
+    var attachment: NSTextAttachment? {
         get { return self.attributes[TextAttribute.attachment.NSAttribute] as? NSTextAttachment }
         set { self.set(value: newValue, for: TextAttribute.attachment) }
     }
     
-    public var backgroundColor: UIColor? {
+    var backgroundColor: UIColor? {
         get { return self.attributes[TextAttribute.backgroundColor.NSAttribute] as? UIColor }
         set { self.set(value: newValue, for: TextAttribute.backgroundColor) }
     }
     
-    public var baselineOffset: NSNumber? {
+    var baselineOffset: NSNumber? {
         get { return self.attributes[TextAttribute.baselineOffset.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.baselineOffset) }
     }
     
-    public var expansion: NSNumber? {
+    var expansion: NSNumber? {
         get { return self.attributes[TextAttribute.expansion.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.expansion) }
     }
     
-    public var font: UIFont? {
+    var font: UIFont? {
         get { return self.attributes[TextAttribute.font.NSAttribute] as? UIFont }
         set { self.set(value: newValue, for: TextAttribute.font) }
     }
     
-    public var foregroundColor: UIColor? {
+    var foregroundColor: UIColor? {
         get { return self.attributes[TextAttribute.foregroundColor.NSAttribute] as? UIColor }
         set { self.set(value: newValue, for: TextAttribute.foregroundColor) }
     }
     
-    public var kern: NSNumber? {
+    var kern: NSNumber? {
         get { return self.attributes[TextAttribute.kern.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.kern) }
     }
     
-    public var ligature: NSNumber? {
+    var ligature: NSNumber? {
         get { return self.attributes[TextAttribute.ligature.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.ligature) }
     }
     
-    public var linkString: NSString? {
+    var linkString: NSString? {
         get { return self.attributes[TextAttribute.link.NSAttribute] as? NSString }
         set { self.set(value: newValue, for: TextAttribute.link) }
     }
     
-    public var linkURL: NSURL? {
+    var linkURL: NSURL? {
         get { return self.attributes[TextAttribute.link.NSAttribute] as? NSURL }
         set { self.set(value: newValue, for: TextAttribute.link) }
     }
     
-    public var obliqueness: NSNumber? {
+    var obliqueness: NSNumber? {
         get { return self.attributes[TextAttribute.obliqueness.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.obliqueness) }
     }
     
-    public var paragraphStyle: NSParagraphStyle? {
+    var paragraphStyle: NSParagraphStyle? {
         get { return self.attributes[TextAttribute.paragraphStyle.NSAttribute] as? NSParagraphStyle }
         set { self.set(value: newValue, for: TextAttribute.paragraphStyle) }
     }
     
-    public var shadow: NSShadow? {
+    var shadow: NSShadow? {
         get { return self.attributes[TextAttribute.shadow.NSAttribute] as? NSShadow }
         set { self.set(value: newValue, for: TextAttribute.shadow) }
     }
     
-    public var strikethroughColor: UIColor? {
+    var strikethroughColor: UIColor? {
         get { return self.attributes[TextAttribute.strikethroughColor.NSAttribute] as? UIColor }
         set { self.set(value: newValue, for: TextAttribute.strikethroughColor) }
     }
     
-    public var strikethroughStyle: NSNumber? {
+    var strikethroughStyle: NSNumber? {
         get { return self.attributes[TextAttribute.strikethroughStyle.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.strikethroughStyle) }
     }
     
-    public var strokeColor: UIColor? {
+    var strokeColor: UIColor? {
         get { return self.attributes[TextAttribute.strokeColor.NSAttribute] as? UIColor }
         set { self.set(value: newValue, for: TextAttribute.strokeColor) }
     }
     
-    public var strokeWidth: NSNumber? {
+    var strokeWidth: NSNumber? {
         get { return self.attributes[TextAttribute.strokeWidth.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.strokeWidth) }
     }
     
-    public var textEffect: NSString? {
+    var textEffect: NSString? {
         get { return self.attributes[TextAttribute.textEffect.NSAttribute] as? NSString }
         set { self.set(value: newValue, for: TextAttribute.textEffect) }
     }
     
-    public var underlineColor: UIColor? {
+    var underlineColor: UIColor? {
         get { return self.attributes[TextAttribute.underlineColor.NSAttribute] as? UIColor }
         set { self.set(value: newValue, for: TextAttribute.underlineColor) }
     }
     
-    public var underlineStyle: NSNumber? {
+    var underlineStyle: NSNumber? {
         get { return self.attributes[TextAttribute.underlineStyle.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.underlineStyle) }
     }
     
-    public var verticalGlyphForm: NSNumber? {
+    var verticalGlyphForm: NSNumber? {
         get { return self.attributes[TextAttribute.verticalGlyphForm.NSAttribute] as? NSNumber }
         set { self.set(value: newValue, for: TextAttribute.verticalGlyphForm) }
     }
     
-    public var writingDirection: [NSNumber]? {
+    var writingDirection: [NSNumber]? {
         get { return self.attributes[TextAttribute.writingDirection.NSAttribute] as? [NSNumber] }
         set { self.set(value: newValue, for: TextAttribute.writingDirection) }
     }
diff --git a/Texty.podspec b/Texty.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Texty'
-  s.version          = '0.2.5'
+  s.version          = '0.2.6'
   s.summary          = 'Enjoy clean and easy text styling using a simplified and structured syntax.'
 
   s.description      = <<-DESC
@@ -13,6 +13,7 @@ DESC
   s.author           = { 'Vectorform' => 'jmeador@vectorform.com', 'Igor Efremov' => 'igor@efremov.io' }
   s.source           = { :git => 'https://github.com/vectorform/Texty.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/vectorform'
+  s.swift_versions   = ['5.0']
 
   s.ios.deployment_target = '8.0'
 
diff --git a/Texty.xcodeproj/project.pbxproj b/Texty.xcodeproj/project.pbxproj
@@ -184,17 +184,18 @@
 					};
 					F0E3719A1EAE82FF00BDEC7F = {
 						CreatedOnToolsVersion = 8.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1130;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = F0E371951EAE82FF00BDEC7F /* Build configuration list for PBXProject "Texty" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = F0E371911EAE82FF00BDEC7F;
 			productRefGroup = F0E3719C1EAE82FF00BDEC7F /* Products */;
@@ -440,7 +441,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -460,7 +461,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Original file line number	Diff line number	Diff line change
`@@ -32,30 +32,30 @@ import Foundation`
`32`	`32`	`internal extension Scanner {`
`33`	`33`
`34`	`34`
`35`		`- internal func incrementLocation() {`
	`35`	`+ func incrementLocation() {`
`36`	`36`	`guard !self.isAtEnd else {`
`37`	`37`	`return`
`38`	`38`	`}`
`39`	`39`	`self.scanLocation += 1`
`40`	`40`	`}`
`41`	`41`
`42`		`- internal func scan(upto string: String) -> String? {`
	`42`	`+ func scan(upto string: String) -> String? {`
`43`	`43`	`var ptr: NSString? = ""`
`44`	`44`	`guard self.scanUpTo(string, into: &ptr) \|\| ((!self.isAtEnd) && ((self.string as NSString).substring(from: self.scanLocation).hasPrefix(string))) else {`
`45`	`45`	`return nil`
`46`	`46`	`}`
`47`	`47`	`return ptr as String?`
`48`	`48`	`}`
`49`	`49`
`50`		`- internal func scanUpToString(_ string: String) -> String? {`
	`50`	`+ func scanUpToString(_ string: String) -> String? {`
`51`	`51`	`var ptr: NSString? = ""`
`52`	`52`	`guard self.scanUpTo(string, into: &ptr) \|\| (!self.isAtEnd) else {`
`53`	`53`	`return nil`
`54`	`54`	`}`
`55`	`55`	`return ptr as String?`
`56`	`56`	`}`
`57`	`57`
`58`		`- internal func scanUpToCharacters(_ characterSet: CharacterSet) -> String? {`
	`58`	`+ func scanUpToCharacters(_ characterSet: CharacterSet) -> String? {`
`59`	`59`	`var ptr: NSString? = ""`
`60`	`60`	`guard self.scanUpToCharacters(from: characterSet, into: &ptr) \|\| (!self.isAtEnd) else {`
`61`	`61`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ internal extension String {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`
`73`		`- internal mutating func findAndRemoveTags() -> [(tag: String, range: NSRange)] {`
	`73`	`+ mutating func findAndRemoveTags() -> [(tag: String, range: NSRange)] {`
`74`	`74`	`let scanner: Scanner = Scanner(string: self)`
`75`	`75`
`76`	`76`	`var tagLocation: Int`
`@@ -142,7 +142,7 @@ internal extension String {`
`142`	`142`
`143`	`143`	`//The tag is closing, and we need to find the first opening tag for it`
`144`	`144`	`//== compares Tag.name properties only`
`145`		`- guard let index = openTags.index(of: tag) else {`
	`145`	`+ guard let index = openTags.firstIndex(of: tag) else {`
`146`	`146`	`assertionFailure("Texty: closing tag found without opening tag (unbalanced tags found in string)")`
`147`	`147`	`continue`
`148`	`148`	`}`
`@@ -161,7 +161,7 @@ internal extension String {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`
`164`		`- internal mutating func stripTags() -> [String : NSRange] {`
	`164`	`+ mutating func stripTags() -> [String : NSRange] {`
`165`	`165`	`let scanner: Scanner = Scanner(string: self)`
`166`	`166`	`var tags: [String : NSRange] = [:]`
`167`	`167`	`var locationOffset: Int = 0`
Original file line number	Diff line number	Diff line change
`@@ -109,112 +109,112 @@ public class TextStyle {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public extension TextStyle {`
`112`		`- public var attachment: NSTextAttachment? {`
	`112`	`+ var attachment: NSTextAttachment? {`
`113`	`113`	`get { return self.attributes[TextAttribute.attachment.NSAttribute] as? NSTextAttachment }`
`114`	`114`	`set { self.set(value: newValue, for: TextAttribute.attachment) }`
`115`	`115`	`}`
`116`	`116`
`117`		`- public var backgroundColor: UIColor? {`
	`117`	`+ var backgroundColor: UIColor? {`
`118`	`118`	`get { return self.attributes[TextAttribute.backgroundColor.NSAttribute] as? UIColor }`
`119`	`119`	`set { self.set(value: newValue, for: TextAttribute.backgroundColor) }`
`120`	`120`	`}`
`121`	`121`
`122`		`- public var baselineOffset: NSNumber? {`
	`122`	`+ var baselineOffset: NSNumber? {`
`123`	`123`	`get { return self.attributes[TextAttribute.baselineOffset.NSAttribute] as? NSNumber }`
`124`	`124`	`set { self.set(value: newValue, for: TextAttribute.baselineOffset) }`
`125`	`125`	`}`
`126`	`126`
`127`		`- public var expansion: NSNumber? {`
	`127`	`+ var expansion: NSNumber? {`
`128`	`128`	`get { return self.attributes[TextAttribute.expansion.NSAttribute] as? NSNumber }`
`129`	`129`	`set { self.set(value: newValue, for: TextAttribute.expansion) }`
`130`	`130`	`}`
`131`	`131`
`132`		`- public var font: UIFont? {`
	`132`	`+ var font: UIFont? {`
`133`	`133`	`get { return self.attributes[TextAttribute.font.NSAttribute] as? UIFont }`
`134`	`134`	`set { self.set(value: newValue, for: TextAttribute.font) }`
`135`	`135`	`}`
`136`	`136`
`137`		`- public var foregroundColor: UIColor? {`
	`137`	`+ var foregroundColor: UIColor? {`
`138`	`138`	`get { return self.attributes[TextAttribute.foregroundColor.NSAttribute] as? UIColor }`
`139`	`139`	`set { self.set(value: newValue, for: TextAttribute.foregroundColor) }`
`140`	`140`	`}`
`141`	`141`
`142`		`- public var kern: NSNumber? {`
	`142`	`+ var kern: NSNumber? {`
`143`	`143`	`get { return self.attributes[TextAttribute.kern.NSAttribute] as? NSNumber }`
`144`	`144`	`set { self.set(value: newValue, for: TextAttribute.kern) }`
`145`	`145`	`}`
`146`	`146`
`147`		`- public var ligature: NSNumber? {`
	`147`	`+ var ligature: NSNumber? {`
`148`	`148`	`get { return self.attributes[TextAttribute.ligature.NSAttribute] as? NSNumber }`
`149`	`149`	`set { self.set(value: newValue, for: TextAttribute.ligature) }`
`150`	`150`	`}`
`151`	`151`
`152`		`- public var linkString: NSString? {`
	`152`	`+ var linkString: NSString? {`
`153`	`153`	`get { return self.attributes[TextAttribute.link.NSAttribute] as? NSString }`
`154`	`154`	`set { self.set(value: newValue, for: TextAttribute.link) }`
`155`	`155`	`}`
`156`	`156`
`157`		`- public var linkURL: NSURL? {`
	`157`	`+ var linkURL: NSURL? {`
`158`	`158`	`get { return self.attributes[TextAttribute.link.NSAttribute] as? NSURL }`
`159`	`159`	`set { self.set(value: newValue, for: TextAttribute.link) }`
`160`	`160`	`}`
`161`	`161`
`162`		`- public var obliqueness: NSNumber? {`
	`162`	`+ var obliqueness: NSNumber? {`
`163`	`163`	`get { return self.attributes[TextAttribute.obliqueness.NSAttribute] as? NSNumber }`
`164`	`164`	`set { self.set(value: newValue, for: TextAttribute.obliqueness) }`
`165`	`165`	`}`
`166`	`166`
`167`		`- public var paragraphStyle: NSParagraphStyle? {`
	`167`	`+ var paragraphStyle: NSParagraphStyle? {`
`168`	`168`	`get { return self.attributes[TextAttribute.paragraphStyle.NSAttribute] as? NSParagraphStyle }`
`169`	`169`	`set { self.set(value: newValue, for: TextAttribute.paragraphStyle) }`
`170`	`170`	`}`
`171`	`171`
`172`		`- public var shadow: NSShadow? {`
	`172`	`+ var shadow: NSShadow? {`
`173`	`173`	`get { return self.attributes[TextAttribute.shadow.NSAttribute] as? NSShadow }`
`174`	`174`	`set { self.set(value: newValue, for: TextAttribute.shadow) }`
`175`	`175`	`}`
`176`	`176`
`177`		`- public var strikethroughColor: UIColor? {`
	`177`	`+ var strikethroughColor: UIColor? {`
`178`	`178`	`get { return self.attributes[TextAttribute.strikethroughColor.NSAttribute] as? UIColor }`
`179`	`179`	`set { self.set(value: newValue, for: TextAttribute.strikethroughColor) }`
`180`	`180`	`}`
`181`	`181`
`182`		`- public var strikethroughStyle: NSNumber? {`
	`182`	`+ var strikethroughStyle: NSNumber? {`
`183`	`183`	`get { return self.attributes[TextAttribute.strikethroughStyle.NSAttribute] as? NSNumber }`
`184`	`184`	`set { self.set(value: newValue, for: TextAttribute.strikethroughStyle) }`
`185`	`185`	`}`
`186`	`186`
`187`		`- public var strokeColor: UIColor? {`
	`187`	`+ var strokeColor: UIColor? {`
`188`	`188`	`get { return self.attributes[TextAttribute.strokeColor.NSAttribute] as? UIColor }`
`189`	`189`	`set { self.set(value: newValue, for: TextAttribute.strokeColor) }`
`190`	`190`	`}`
`191`	`191`
`192`		`- public var strokeWidth: NSNumber? {`
	`192`	`+ var strokeWidth: NSNumber? {`
`193`	`193`	`get { return self.attributes[TextAttribute.strokeWidth.NSAttribute] as? NSNumber }`
`194`	`194`	`set { self.set(value: newValue, for: TextAttribute.strokeWidth) }`
`195`	`195`	`}`
`196`	`196`
`197`		`- public var textEffect: NSString? {`
	`197`	`+ var textEffect: NSString? {`
`198`	`198`	`get { return self.attributes[TextAttribute.textEffect.NSAttribute] as? NSString }`
`199`	`199`	`set { self.set(value: newValue, for: TextAttribute.textEffect) }`
`200`	`200`	`}`
`201`	`201`
`202`		`- public var underlineColor: UIColor? {`
	`202`	`+ var underlineColor: UIColor? {`
`203`	`203`	`get { return self.attributes[TextAttribute.underlineColor.NSAttribute] as? UIColor }`
`204`	`204`	`set { self.set(value: newValue, for: TextAttribute.underlineColor) }`
`205`	`205`	`}`
`206`	`206`
`207`		`- public var underlineStyle: NSNumber? {`
	`207`	`+ var underlineStyle: NSNumber? {`
`208`	`208`	`get { return self.attributes[TextAttribute.underlineStyle.NSAttribute] as? NSNumber }`
`209`	`209`	`set { self.set(value: newValue, for: TextAttribute.underlineStyle) }`
`210`	`210`	`}`
`211`	`211`
`212`		`- public var verticalGlyphForm: NSNumber? {`
	`212`	`+ var verticalGlyphForm: NSNumber? {`
`213`	`213`	`get { return self.attributes[TextAttribute.verticalGlyphForm.NSAttribute] as? NSNumber }`
`214`	`214`	`set { self.set(value: newValue, for: TextAttribute.verticalGlyphForm) }`
`215`	`215`	`}`
`216`	`216`
`217`		`- public var writingDirection: [NSNumber]? {`
	`217`	`+ var writingDirection: [NSNumber]? {`
`218`	`218`	`get { return self.attributes[TextAttribute.writingDirection.NSAttribute] as? [NSNumber] }`
`219`	`219`	`set { self.set(value: newValue, for: TextAttribute.writingDirection) }`
`220`	`220`	`}`