Merge pull request #1 from tilltue/master

swift 4.0
inkyfox · Oct 9, 2017 · 40b7141 · 40b7141
2 parents e494290 + 6d64840
commit 40b7141
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Sources/KRWordWrapLabel.swift b/Sources/KRWordWrapLabel.swift
@@ -104,12 +104,12 @@ import UIKit
                     .map { s -> NSAttributedString? in
                         return s == "" ? nil :
                             NSAttributedString(string: s,
-                                attributes: [NSFontAttributeName : font, NSForegroundColorAttributeName: self.textColor])
+                                               attributes: [NSAttributedStringKey.font : font, NSAttributedStringKey.foregroundColor: self.textColor])
                     }
                     .flatMap { t -> Word? in
                         if let text = t {
                             let size = text.size()
-                            let spaceWidth = NSAttributedString(string: String(repeating: " ", count: w), attributes: [NSFontAttributeName : font]).size().width
+                            let spaceWidth = NSAttributedString(string: String(repeating: " ", count: w), attributes: [NSAttributedStringKey.font : font]).size().width
                             w = 1
                             return Word(
                                 text: text,
@@ -125,7 +125,7 @@ import UIKit
                 if words.count > 0 {
                     return words
                 } else {
-                    let text = NSAttributedString(string: " ", attributes: [NSFontAttributeName : font])
+                    let text = NSAttributedString(string: " ", attributes: [NSAttributedStringKey.font : font])
                     let size = text.size()
                     return [Word(
                         text: text,
@@ -137,7 +137,7 @@ import UIKit
 
         do {
             let text = NSAttributedString(string: self.ellipsis,
-                attributes: [NSFontAttributeName : font, NSForegroundColorAttributeName: self.textColor])
+                                          attributes: [NSAttributedStringKey.font : font, NSAttributedStringKey.foregroundColor: self.textColor])
             let size = text.size()
 
             self.ellipsisWord = Word(