Merge pull request #40 from gregpardo/master

A couple final Swift 4 fixes (#39)
Nirma · Sep 21, 2017 · 8c6f616 · 8c6f616
2 parents 7248a2d + 1b83fca
commit 8c6f616
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Attributed.xcodeproj/project.pbxproj b/Attributed.xcodeproj/project.pbxproj
@@ -405,7 +405,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -425,7 +425,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = attributed.Attributed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;

diff --git a/Attributed/Attributes.swift b/Attributed/Attributes.swift
@@ -89,7 +89,7 @@ public struct Attributes {
     }
 
     public func baselineOffset(_ offset: NSNumber) -> Attributes {
-        return self + Attributes(dictionary: [NSBaselineOffsetAttributeName: offset])
+        return self + Attributes(dictionary: [NSAttributedStringKey.baselineOffset: offset])
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ public struct Attributes { @@
         }
         public func baselineOffset(_ offset: NSNumber) -> Attributes {
-            return self + Attributes(dictionary: [NSBaselineOffsetAttributeName: offset])
+            return self + Attributes(dictionary: [NSAttributedStringKey.baselineOffset: offset])
         }
     }
@@ Expand Down @@