Merge pull request #40 from gregpardo/master

Nicholas Maccharoli · web-flow · commit 8c6f6162b6b1 · 2017-09-21T09:38:58.000+09:00
A couple final Swift 4 fixes (#39)
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 number	Diff line change
`@@ -89,7 +89,7 @@ public struct Attributes {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public func baselineOffset(_ offset: NSNumber) -> Attributes {`
`92`		`- return self + Attributes(dictionary: [NSBaselineOffsetAttributeName: offset])`
	`92`	`+ return self + Attributes(dictionary: [NSAttributedStringKey.baselineOffset: offset])`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`