correct swift version

evermeer · Sep 21, 2018 · ea62827 · ea62827
1 parent 9ee9f10
commit ea62827
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/AttributedTextView.podspec b/AttributedTextView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'AttributedTextView'
- s.version = '1.2.2'
+ s.version = '1.2.3'
  s.license = { :type => "MIT", :file => "LICENSE" }
  s.summary = 'Easiest way to create an attributed UILabel or UITextView (with support for multiple links and HTML)'
  s.homepage = 'https://github.com/evermeer/AttributedTextView'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
  s.platforms     = { :ios => "8.0" }
  s.requires_arc = true
  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
-
+ s.swift_version = '4.2'
  s.frameworks = "Foundation", "UIKit"
  s.source_files  = "Sources/*.swift"
 end
diff --git a/AttributedTextView.xcodeproj/project.pbxproj b/AttributedTextView.xcodeproj/project.pbxproj
@@ -85,6 +85,9 @@
 		7FDAE1361DEF192A00CB46B6 /* Sample2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sample2.png; sourceTree = "<group>"; };
 		7FDAE1371DEF192A00CB46B6 /* Sample3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sample3.png; sourceTree = "<group>"; };
 		7FDAE1381DEF192A00CB46B6 /* Sample4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sample4.png; sourceTree = "<group>"; };
+		7FF12E28215501FA005769A5 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
+		7FF12E2A215501FA005769A5 /* .swift-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".swift-version"; sourceTree = "<group>"; };
+		7FF12E2B21550219005769A5 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -130,6 +133,9 @@
 		3549BAFB1DA387DB00C63030 = {
 			isa = PBXGroup;
 			children = (
+				7FF12E2B21550219005769A5 /* .gitignore */,
+				7FF12E2A215501FA005769A5 /* .swift-version */,
+				7FF12E28215501FA005769A5 /* .swiftlint.yml */,
 				3549BB161DA3890B00C63030 /* Sources */,
 				7F652A761DEE09E900A1E61F /* Demo */,
 				7FDAE1341DEF192A00CB46B6 /* Screenshots */,
@@ -677,7 +683,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -697,7 +703,7 @@
 				PRODUCT_NAME = AttributedTextView;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -720,7 +726,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -744,7 +750,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -771,7 +777,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -795,7 +801,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -817,7 +823,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -840,7 +846,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};

diff --git a/Sources/AttributedTextView.swift b/Sources/AttributedTextView.swift
@@ -84,7 +84,7 @@ import UIKit
                 self.isEditable = false
             }
             if let color = _attributer?.linkColor {
-                self.linkTextAttributes = [NSAttributedString.Key.foregroundColor.rawValue: color as Any]
+                self.linkTextAttributes = [NSAttributedString.Key.foregroundColor: color as Any]
             }
         }
     }

diff --git a/Sources/Attributer.swift b/Sources/Attributer.swift
@@ -618,16 +618,16 @@ open class Attributer {
      underline the active range
      */
     open var underline: Attributer {
-        return applyUnderline(NSUnderlineStyle.styleSingle)
+        return applyUnderline(NSUnderlineStyle.single)
     }
 
     /**
      set the underline style for the active range (you also have to call .underline)
      
      -parameter underline: The underline style
      */
-    open func applyUnderline(_ underline: NSUnderlineStyle) -> Attributer {
-        return applyAttributes(NSAttributedString.Key.underlineStyle.rawValue, value: underline.rawValue as AnyObject)
+    open func applyUnderline(_ style: NSUnderlineStyle) -> Attributer {
+        return applyAttributes(NSAttributedString.Key.underlineStyle.rawValue, value: style.rawValue as AnyObject)
     }
 
     /**