Merge branch 'release/2.0.5'

malcommac · malcommac · commit bafd9482ee80 · 2018-09-20T09:36:02.000+02:00
diff --git a/Configs/SwiftRichString.plist b/Configs/SwiftRichString.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ExampleWatchOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/ExampleWatchOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -37,8 +37,15 @@
       "size" : "44x44",
       "idiom" : "watch",
       "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
+      "role" : "appLauncher",
+      "subtype" : "40mm"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "44mm"
     },
     {
       "size" : "86x86",
@@ -53,6 +60,25 @@
       "scale" : "2x",
       "role" : "quickLook",
       "subtype" : "42mm"
+    },
+    {
+      "size" : "108x108",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "44mm"
+    },
+    {
+      "idiom" : "watch-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "longLook",
+      "subtype" : "42mm"
     }
   ],
   "info" : {
diff --git a/ExampleiOS/AppDelegate.swift b/ExampleiOS/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 
 
-	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+	private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 		// Override point for customization after application launch.
 		return true
 	}
diff --git a/Sources/SwiftRichString/Attributes/CommonsAttributes.swift b/Sources/SwiftRichString/Attributes/CommonsAttributes.swift
@@ -54,7 +54,7 @@ import CoreGraphics
 	public typealias Image = UIImage
 	public typealias Font = UIFont
 	public typealias FontDescriptor = UIFontDescriptor
-	public typealias SymbolicTraits = UIFontDescriptorSymbolicTraits
+	public typealias SymbolicTraits = UIFontDescriptor.SymbolicTraits
 	public typealias LineBreak = NSLineBreakMode
 
 	let FontDescriptorFeatureSettingsAttribute = UIFontDescriptor.AttributeName.featureSettings
diff --git a/Sources/SwiftRichString/Attributes/FontData.swift b/Sources/SwiftRichString/Attributes/FontData.swift
@@ -100,7 +100,7 @@ public class FontData {
 	///
 	/// - Parameter size: ignored. It will be overriden by `fontSize` property.
 	/// - Returns: instance of the font
-	var attributes: [NSAttributedStringKey:Any] {
+	var attributes: [NSAttributedString.Key:Any] {
 		guard !self.explicitFont else {
 			return [:]
 		}
@@ -139,8 +139,8 @@ public class FontData {
 	///   - currentFont: current font.
 	///   - currentSize: current font size.
 	/// - Returns: attributes
-	public func attributes(currentFont: FontConvertible?, size currentSize: CGFloat?) -> [NSAttributedStringKey:Any] {
-		var finalAttributes: [NSAttributedStringKey:Any] = [:]
+	public func attributes(currentFont: FontConvertible?, size currentSize: CGFloat?) -> [NSAttributedString.Key:Any] {
+		var finalAttributes: [NSAttributedString.Key:Any] = [:]
 
 		// generate an initial font from passed FontConvertible instance
 		guard let size = (self.size ?? currentSize) else { return [:] }
diff --git a/Sources/SwiftRichString/Extensions/AttributedString+Ext.swift b/Sources/SwiftRichString/Extensions/AttributedString+Ext.swift
@@ -146,7 +146,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style will be removed, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func removeAttributes(_ keys: [NSAttributedStringKey], range: NSRange) -> Self {
+	public func removeAttributes(_ keys: [NSAttributedString.Key], range: NSRange) -> Self {
 		keys.forEach { self.removeAttribute($0, range: range) }
 		return self
 	}
@@ -156,7 +156,7 @@ public extension AttributedString {
 	/// - Parameter style: style to use.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	public func remove(_ style: StyleProtocol) -> Self {
-		self.removeAttributes(Array(style.attributes.keys), range: NSMakeRange(0, self.string.count))
+		self.removeAttributes(Array(style.attributes.keys), range: NSMakeRange(0, self.length))
 		return self
 	}
 	
diff --git a/Sources/SwiftRichString/Style/Style.swift b/Sources/SwiftRichString/Style/Style.swift
@@ -50,11 +50,11 @@ public class Style: StyleProtocol {
 	
 	/// Attributes defined by the style. This is the dictionary modified when you
 	/// set a style attributed.
-	private var innerAttributes: [NSAttributedStringKey : Any] = [:]
+	private var innerAttributes: [NSAttributedString.Key : Any] = [:]
 	
 	/// This is a cache array used to avoid the evaluation of font description and other
 	/// sensitive data. Cache is invalidated automatically when needed.
-	private var cachedAttributes: [NSAttributedStringKey : Any]? = nil
+	private var cachedAttributes: [NSAttributedString.Key : Any]? = nil
 	
 	//MARK: - PROPERTIES
 
@@ -347,14 +347,14 @@ public class Style: StyleProtocol {
 	
 	/// Enable spoken of all punctuation in the text.
 	public var speaksPunctuation: Bool? {
-		set { self.set(attribute: newValue, forKey: NSAttributedStringKey(UIAccessibilitySpeechAttributePunctuation)) }
-		get { return self.get(attributeForKey: NSAttributedStringKey(UIAccessibilitySpeechAttributePunctuation)) }
+		set { self.set(attribute: newValue, forKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechPunctuation))) }
+		get { return self.get(attributeForKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechPunctuation))) }
 	}
 	
 	/// The language to use when speaking a string (value is a BCP 47 language code string).
 	public var speakingLanguage: String? {
-		set { self.set(attribute: newValue, forKey: NSAttributedStringKey(UIAccessibilitySpeechAttributeLanguage)) }
-		get { return self.get(attributeForKey: NSAttributedStringKey(UIAccessibilitySpeechAttributeLanguage)) }
+		set { self.set(attribute: newValue, forKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechLanguage))) }
+		get { return self.get(attributeForKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechLanguage))) }
 	}
 	
 	/// Pitch to apply to spoken content. Value must be in range range 0.0 to 2.0.
@@ -364,16 +364,16 @@ public class Style: StyleProtocol {
 	///
 	/// The default value for this attribute is 1.0, which indicates a normal pitch.
 	public var speakingPitch: Double? {
-		set { self.set(attribute: newValue, forKey: NSAttributedStringKey(UIAccessibilitySpeechAttributePitch)) }
-		get { return self.get(attributeForKey: NSAttributedStringKey(UIAccessibilitySpeechAttributePitch)) }
+		set { self.set(attribute: newValue, forKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechPitch))) }
+		get { return self.get(attributeForKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechPitch))) }
 	}
 
 	/// No overview available.
 	/// Note: available only from iOS 11, tvOS 11 and watchOS 4.
 	@available(iOS 11.0, tvOS 11.0, iOSApplicationExtension 11.0, watchOS 4, *)
 	public var speakingPronunciation: String? {
-		set { self.set(attribute: newValue, forKey: NSAttributedStringKey(UIAccessibilitySpeechAttributeIPANotation)) }
-		get { return self.get(attributeForKey: NSAttributedStringKey(UIAccessibilitySpeechAttributeIPANotation)) }
+		set { self.set(attribute: newValue, forKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechIPANotation))) }
+		get { return self.get(attributeForKey: NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechIPANotation))) }
 	}
 	
 	/// Spoken text is queued behind, or interrupts, existing spoken content.
@@ -384,15 +384,15 @@ public class Style: StyleProtocol {
 	@available(iOS 11.0, tvOS 11.0, iOSApplicationExtension 11.0, watchOS 4, *)
 	public var shouldQueueSpeechAnnouncement: Bool? {
 		set {
-			let key = NSAttributedStringKey(UIAccessibilitySpeechAttributeQueueAnnouncement)
+			let key = NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechQueueAnnouncement))
 			guard let v = newValue else {
 				self.innerAttributes.removeValue(forKey: key)
 				return
 			}
 			self.set(attribute: NSNumber.init(value: v), forKey: key)
 		}
 		get {
-			let key = NSAttributedStringKey(UIAccessibilitySpeechAttributeQueueAnnouncement)
+			let key = NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilitySpeechQueueAnnouncement))
 			if let n: NSNumber = self.get(attributeForKey: key) {
 				return n.boolValue
 			} else { return false }
@@ -405,15 +405,15 @@ public class Style: StyleProtocol {
 	@available(iOS 11.0, tvOS 11.0, iOSApplicationExtension 11.0, watchOS 4, *)
 	public var headingLevel: HeadingLevel? {
 		set {
-			let key = NSAttributedStringKey(UIAccessibilityTextAttributeHeadingLevel)
+			let key = NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilityTextHeadingLevel))
 			guard let v = newValue else {
 				self.innerAttributes.removeValue(forKey: key)
 				return
 			}
 			self.set(attribute: v.rawValue, forKey: key)
 		}
 		get {
-			let key = NSAttributedStringKey(UIAccessibilityTextAttributeHeadingLevel)
+			let key = NSAttributedString.Key(convertFromNSAttributedStringKey(NSAttributedString.Key.accessibilityTextHeadingLevel))
 			if let n: Int = self.get(attributeForKey: key) {
 				return HeadingLevel(rawValue: n)
 			} else { return nil }
@@ -546,7 +546,7 @@ public class Style: StyleProtocol {
 	/// Font related attributes are not set automatically but are encapsulasted to the font object itself.
 	///
 	/// - Parameter dictionary: dictionary to set
-	public init(dictionary: [NSAttributedStringKey: Any]?) {
+	public init(dictionary: [NSAttributedString.Key: Any]?) {
 		self.fontData?.style = self
 		if let font = dictionary?[.font] as? Font {
 			self.fontData?.font = font
@@ -578,7 +578,7 @@ public class Style: StyleProtocol {
 	/// - Parameters:
 	///   - value: valid value to set, `nil` to remove exiting value for given key.
 	///   - key: key to set
-	public func set<T>(attribute value: T?, forKey key: NSAttributedStringKey) {
+	public func set<T>(attribute value: T?, forKey key: NSAttributedString.Key) {
 		guard let value = value else {
 			self.innerAttributes.removeValue(forKey: key)
 			return
@@ -591,12 +591,12 @@ public class Style: StyleProtocol {
 	///
 	/// - Parameter key: key to read.
 	/// - Returns: value or `nil` if value is not set.
-	public func get<T>(attributeForKey key: NSAttributedStringKey) -> T? {
+	public func get<T>(attributeForKey key: NSAttributedString.Key) -> T? {
 		return (self.innerAttributes[key] as? T)
 	}
 	
 	/// Return all attributes defined by the style.
-	public var attributes: [NSAttributedStringKey : Any] {
+	public var attributes: [NSAttributedString.Key : Any] {
 		if let cachedAttributes = self.cachedAttributes {
 			return cachedAttributes
 		}
@@ -617,3 +617,8 @@ public class Style: StyleProtocol {
 		return styleCopy
 	}
 }
+
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertFromNSAttributedStringKey(_ input: NSAttributedString.Key) -> String {
+	return input.rawValue
+}
diff --git a/Sources/SwiftRichString/Style/StyleGroup.swift b/Sources/SwiftRichString/Style/StyleGroup.swift
@@ -83,9 +83,11 @@ public class StyleGroup: StyleProtocol {
 	
 	/// Return all attributes merge of each single `Style` of the group.
 	/// Attributes are reported in order of the insertion regardeless the associated name.
-	public var attributes: [NSAttributedStringKey : Any] {
-		var composedAttributes: [NSAttributedStringKey: Any] = [:]
-		self.styles.enumerated().forEach { (_,style) in
+	public var attributes: [NSAttributedString.Key : Any] {
+		var composedAttributes: [NSAttributedString.Key: Any] = [:]
+		self.styles.enumerated().forEach { (arg) in
+			
+			let (_, style) = arg
 			composedAttributes.merge(style.attributes, uniquingKeysWith: { (_, new) in return new })
 		}
 		return composedAttributes
@@ -257,7 +259,7 @@ public extension Array where Array.Element == StyleProtocol {
 	///
 	/// - Returns: merged style
 	public func mergeStyle() -> Style {
-		var attributes: [NSAttributedStringKey:Any] = [:]
+		var attributes: [NSAttributedString.Key:Any] = [:]
 		self.forEach { attributes.merge($0.attributes, uniquingKeysWith: { (_, new) in return new }) }
 		return Style(dictionary: attributes)
 	}
diff --git a/Sources/SwiftRichString/Style/StyleProtocol.swift b/Sources/SwiftRichString/Style/StyleProtocol.swift
@@ -35,7 +35,7 @@ public typealias AttributedString = NSMutableAttributedString
 public protocol StyleProtocol: class {
 	
 	/// Return the attributes of the style in form of dictionary `NSAttributedStringKey`/`Any`.
-	var attributes: [NSAttributedStringKey : Any] { get }
+	var attributes: [NSAttributedString.Key : Any] { get }
 	
 	/// Font unique attributes dictionary.
 	var fontData: FontData? { get }
@@ -56,7 +56,7 @@ public extension StyleProtocol {
 	func set(to source: String, range: NSRange?) -> AttributedString {
 		let attributedText = NSMutableAttributedString(string: source)
 		self.fontData?.addAttributes(to: attributedText, range: nil)
-		attributedText.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.count)))
+		attributedText.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, attributedText.length)))
 		return attributedText
 	}
 	
diff --git a/Sources/SwiftRichString/Style/StyleRegEx.swift b/Sources/SwiftRichString/Style/StyleRegEx.swift
@@ -51,7 +51,7 @@ public class StyleRegEx: StyleProtocol {
 	private var style: StyleProtocol
 	
 	/// Style attributes
-	public var attributes: [NSAttributedStringKey : Any] {
+	public var attributes: [NSAttributedString.Key : Any] {
 		return self.style.attributes
 	}
 	
@@ -90,14 +90,14 @@ public class StyleRegEx: StyleProtocol {
 	
 	public func add(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.string.count)))
+			source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: true, range: range)
 	}
 	
 	public func set(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.string.count)))
+			source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: false, range: range)
 	}
@@ -112,7 +112,7 @@ public class StyleRegEx: StyleProtocol {
 	///   - range: range, `nil` to apply the style to entire string.
 	/// - Returns: modified attributed string
 	private func applyStyle(to str: AttributedString, add: Bool, range: NSRange?) -> AttributedString {
-		let rangeValue = (range ?? NSMakeRange(0, str.string.count))
+		let rangeValue = (range ?? NSMakeRange(0, str.length))
 		
 		let matchOpts = NSRegularExpression.MatchingOptions(rawValue: 0)
 		self.regex.enumerateMatches(in: str.string, options: matchOpts, range: rangeValue) {
diff --git a/SwiftRichString.podspec b/SwiftRichString.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftRichString"
-  s.version      = "2.0.4"
+  s.version      = "2.0.5"
   s.summary      = "Elegant Strings & Attributed Strings Toolkit for Swift"
   s.description  = <<-DESC
     SwiftRichString is the best toolkit to work easily with Strings and Attributed Strings.
@@ -16,4 +16,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/malcommac/SwiftRichString.git", :tag => s.version.to_s }
   s.source_files  = "Sources/**/*"
   s.frameworks  = "Foundation"
+  s.swift_version = "4.0"
 end
diff --git a/SwiftRichString.xcodeproj/project.pbxproj b/SwiftRichString.xcodeproj/project.pbxproj
diff --git a/SwiftRichString.xcodeproj/xcuserdata/daniele.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftRichString.xcodeproj/xcuserdata/daniele.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`14`	`14`	`var window: UIWindow?`
`15`	`15`
`16`	`16`
`17`		`- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {`
	`17`	`+ private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {`
`18`	`18`	`// Override point for customization after application launch.`
`19`	`19`	`return true`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class StyleRegEx: StyleProtocol {`
`51`	`51`	`private var style: StyleProtocol`
`52`	`52`
`53`	`53`	`/// Style attributes`
`54`		`- public var attributes: [NSAttributedStringKey : Any] {`
	`54`	`+ public var attributes: [NSAttributedString.Key : Any] {`
`55`	`55`	`return self.style.attributes`
`56`	`56`	`}`
`57`	`57`
`@@ -90,14 +90,14 @@ public class StyleRegEx: StyleProtocol {`
`90`	`90`
`91`	`91`	`public func add(to source: AttributedString, range: NSRange?) -> AttributedString {`
`92`	`92`	`if let base = self.baseStyle {`
`93`		`- source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.string.count)))`
	`93`	`+ source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))`
`94`	`94`	`}`
`95`	`95`	`return self.applyStyle(to: source, add: true, range: range)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public func set(to source: AttributedString, range: NSRange?) -> AttributedString {`
`99`	`99`	`if let base = self.baseStyle {`
`100`		`- source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.string.count)))`
	`100`	`+ source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))`
`101`	`101`	`}`
`102`	`102`	`return self.applyStyle(to: source, add: false, range: range)`
`103`	`103`	`}`
`@@ -112,7 +112,7 @@ public class StyleRegEx: StyleProtocol {`
`112`	`112`	/// - range: range, `nil` to apply the style to entire string.
`113`	`113`	`/// - Returns: modified attributed string`
`114`	`114`	`private func applyStyle(to str: AttributedString, add: Bool, range: NSRange?) -> AttributedString {`
`115`		`- let rangeValue = (range ?? NSMakeRange(0, str.string.count))`
	`115`	`+ let rangeValue = (range ?? NSMakeRange(0, str.length))`
`116`	`116`
`117`	`117`	`let matchOpts = NSRegularExpression.MatchingOptions(rawValue: 0)`
`118`	`118`	`self.regex.enumerateMatches(in: str.string, options: matchOpts, range: rangeValue) {`