Merge pull request #27 from jjcastro/master

Swift 4.0 compatibility

.swift-version

@@ -1 +1 @@
-3.0
+4.0

MarkdownKit.podspec

@@ -16,7 +16,7 @@ all the Markdown elements.
   s.source           = { :git => 'https://github.com/ivanbruel/MarkdownKit.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/ivanbruel'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
 
   s.source_files = 'MarkdownKit/Classes/**/*'
   s.frameworks = 'UIKit'

MarkdownKit/Classes/Elements/Escaping/MarkdownCodeEscaping.swift

@@ -21,7 +21,7 @@ open class MarkdownCodeEscaping: MarkdownElement {
   }
 
   open func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
-    let range = match.rangeAt(2)
+    let range = match.range(at: 2)
     // escaping all characters
     let matchString = attributedString.attributedSubstring(from: range).string
     let escapedString = Array<UInt16>(matchString.utf16)

MarkdownKit/Classes/Elements/MarkdownHeader.swift

@@ -34,11 +34,11 @@ open class MarkdownHeader: MarkdownLevelElement {
       attributedString.deleteCharacters(in: range)
   }
 
-  open func attributesForLevel(_ level: Int) -> [String: AnyObject] {
+    open func attributesForLevel(_ level: Int) -> [NSAttributedString.Key: AnyObject] {
     var attributes = self.attributes
     if let font = font {
-      let headerFontSize: CGFloat = font.pointSize + (CGFloat(level) * CGFloat(fontIncrease))
-      attributes[NSFontAttributeName] = font.withSize(headerFontSize)
+        let headerFontSize: CGFloat = font.pointSize + 4 + (-1 * CGFloat(level) * CGFloat(fontIncrease))
+        attributes[NSAttributedString.Key.font] = font.withSize(headerFontSize).bold()
     }
     return attributes
   }

MarkdownKit/Classes/Elements/MarkdownLink.swift

@@ -36,7 +36,7 @@ open class MarkdownLink: MarkdownLinkElement {
       return
     }
     guard let url = URL(string: link) ?? URL(string: encodedLink) else { return }
-    attributedString.addAttribute(NSLinkAttributeName, value: url, range: range)
+    attributedString.addAttribute(NSAttributedString.Key.link, value: url, range: range)
   }
 
   open func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {

MarkdownKit/Classes/Extensions/String+UTF16.swift

@@ -25,8 +25,7 @@ extension String {
     stride(from: 0, to: characters.count, by: 4).forEach {
       let startIndex = characters.index(characters.startIndex, offsetBy: $0)
       let endIndex = characters.index(characters.startIndex, offsetBy: $0 + 4)
-      let hex4 = substring(with: startIndex..<endIndex)
-
+      let hex4 = String(self[startIndex..<endIndex])
       if let utf16 = UInt16(hex4, radix: 16) {
         utf16Array.append(utf16)
       }

MarkdownKit/Classes/Extensions/UIFont+Traits.swift

@@ -9,9 +9,9 @@ import UIKit
 
 extension UIFont {
 
-  func withTraits(_ traits: UIFontDescriptorSymbolicTraits...) -> UIFont {
+    func withTraits(_ traits: UIFontDescriptor.SymbolicTraits...) -> UIFont {
     let descriptor = fontDescriptor
-      .withSymbolicTraits(UIFontDescriptorSymbolicTraits(traits))
+        .withSymbolicTraits(UIFontDescriptor.SymbolicTraits(traits))
     return UIFont(descriptor: descriptor!, size: 0)
   }
 

MarkdownKit/Classes/MarkdownParser.swift

@@ -80,7 +80,7 @@ open class MarkdownParser {
 
   open func parse(_ markdown: NSAttributedString) -> NSAttributedString {
     let attributedString = NSMutableAttributedString(attributedString: markdown)
-    attributedString.addAttribute(NSFontAttributeName, value: font,
+    attributedString.addAttribute(NSAttributedString.Key.font, value: font,
                                   range: NSRange(location: 0, length: attributedString.length))
     var elements: [MarkdownElement] = escapingElements
     elements.append(contentsOf: defaultElements)

MarkdownKit/Classes/Protocols/MarkdownCommonElement.swift

@@ -27,10 +27,10 @@ public extension MarkdownCommonElement {
 
   func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
     // deleting trailing markdown
-    attributedString.deleteCharacters(in: match.rangeAt(4))
+    attributedString.deleteCharacters(in: match.range(at: 4))
     // formatting string (may alter the length)
-    addAttributes(attributedString, range: match.rangeAt(3))
+    addAttributes(attributedString, range: match.range(at: 3))
     // deleting leading markdown
-    attributedString.deleteCharacters(in: match.rangeAt(2))
+    attributedString.deleteCharacters(in: match.range(at: 2))
   }
 }

MarkdownKit/Classes/Protocols/MarkdownLevelElement.swift

@@ -17,7 +17,7 @@ public protocol MarkdownLevelElement: MarkdownElement, MarkdownStyle {
 
   func formatText(_ attributedString: NSMutableAttributedString, range: NSRange, level: Int)
   func addAttributes(_ attributedString: NSMutableAttributedString, range: NSRange, level: Int)
-  func attributesForLevel(_ level: Int) -> [String: AnyObject]
+    func attributesForLevel(_ level: Int) -> [NSAttributedString.Key: AnyObject]
 }
 
 public extension MarkdownLevelElement {
@@ -31,15 +31,15 @@ public extension MarkdownLevelElement {
     attributedString.addAttributes(attributesForLevel(level - 1), range: range)
   }
 
-  func attributesForLevel(_ level: Int) -> [String: AnyObject] {
+    func attributesForLevel(_ level: Int) -> [NSAttributedString.Key: AnyObject] {
     return self.attributes
   }
 
   func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
-    let level = match.rangeAt(1).length
-    addAttributes(attributedString, range: match.rangeAt(2), level: level)
-    let range = NSRange(location: match.rangeAt(1).location,
-                        length: match.rangeAt(2).location - match.rangeAt(1).location)
+    let level = match.range(at: 1).length
+    addAttributes(attributedString, range: match.range(at: 2), level: level)
+    let range = NSRange(location: match.range(at: 1).location,
+                        length: match.range(at: 2).location - match.range(at: 1).location)
     formatText(attributedString, range: range, level: level)
   }
 }

MarkdownKit/Classes/Protocols/MarkdownStyle.swift

@@ -13,20 +13,20 @@ public protocol MarkdownStyle {
 
   var font: UIFont? { get }
   var color: UIColor? { get }
-  var attributes: [String: AnyObject] { get }
+    var attributes: [NSAttributedString.Key: AnyObject] { get }
 }
 
 public extension MarkdownStyle {
 
-  var attributes: [String: AnyObject] {
-    var attributes = [String: AnyObject]()
+    var attributes: [NSAttributedString.Key: AnyObject] {
+        var attributes = [NSAttributedString.Key: AnyObject]()
     if let font = font {
-      attributes[NSFontAttributeName] = font
+        attributes[NSAttributedString.Key.font] = font
     }
     if let color = color {
-      attributes[NSForegroundColorAttributeName] = color
+        attributes[NSAttributedString.Key.foregroundColor] = color
     }
     return attributes
   }
 
-}
+}