Skip to content

Commit 5adc142

Browse files
committed
Merge branch 'XCode10'
2 parents 4f11402 + 47a573f commit 5adc142

File tree

5 files changed

+76
-68
lines changed

5 files changed

+76
-68
lines changed

AttributedTextView.xcodeproj/project.pbxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@
665665
SKIP_INSTALL = YES;
666666
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
667667
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
668-
SWIFT_VERSION = 4.0;
668+
SWIFT_VERSION = 4.2;
669669
};
670670
name = Debug;
671671
};
@@ -685,7 +685,7 @@
685685
PRODUCT_NAME = AttributedTextView;
686686
SKIP_INSTALL = YES;
687687
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
688-
SWIFT_VERSION = 4.0;
688+
SWIFT_VERSION = 4.2;
689689
};
690690
name = Release;
691691
};
@@ -708,7 +708,7 @@
708708
SKIP_INSTALL = YES;
709709
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
710710
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
711-
SWIFT_VERSION = 4.0;
711+
SWIFT_VERSION = 4.2;
712712
TARGETED_DEVICE_FAMILY = 4;
713713
WATCHOS_DEPLOYMENT_TARGET = 3.0;
714714
};
@@ -732,7 +732,7 @@
732732
SDKROOT = watchos;
733733
SKIP_INSTALL = YES;
734734
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
735-
SWIFT_VERSION = 4.0;
735+
SWIFT_VERSION = 4.2;
736736
TARGETED_DEVICE_FAMILY = 4;
737737
WATCHOS_DEPLOYMENT_TARGET = 3.0;
738738
};
@@ -759,7 +759,7 @@
759759
SKIP_INSTALL = YES;
760760
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
761761
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
762-
SWIFT_VERSION = 4.0;
762+
SWIFT_VERSION = 4.2;
763763
};
764764
name = Debug;
765765
};
@@ -783,7 +783,7 @@
783783
SDKROOT = macosx;
784784
SKIP_INSTALL = YES;
785785
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
786-
SWIFT_VERSION = 4.0;
786+
SWIFT_VERSION = 4.2;
787787
};
788788
name = Release;
789789
};
@@ -805,7 +805,7 @@
805805
SKIP_INSTALL = YES;
806806
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
807807
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
808-
SWIFT_VERSION = 4.0;
808+
SWIFT_VERSION = 4.2;
809809
TARGETED_DEVICE_FAMILY = 3;
810810
TVOS_DEPLOYMENT_TARGET = 10.0;
811811
};
@@ -828,7 +828,7 @@
828828
SDKROOT = appletvos;
829829
SKIP_INSTALL = YES;
830830
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
831-
SWIFT_VERSION = 4.0;
831+
SWIFT_VERSION = 4.2;
832832
TARGETED_DEVICE_FAMILY = 3;
833833
TVOS_DEPLOYMENT_TARGET = 10.0;
834834
};
@@ -845,7 +845,7 @@
845845
PRODUCT_BUNDLE_IDENTIFIER = nl.evict.Demo;
846846
PRODUCT_NAME = "$(TARGET_NAME)";
847847
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
848-
SWIFT_VERSION = 4.0;
848+
SWIFT_VERSION = 4.2;
849849
};
850850
name = Debug;
851851
};
@@ -860,7 +860,7 @@
860860
PRODUCT_BUNDLE_IDENTIFIER = nl.evict.Demo;
861861
PRODUCT_NAME = "$(TARGET_NAME)";
862862
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
863-
SWIFT_VERSION = 4.0;
863+
SWIFT_VERSION = 4.2;
864864
};
865865
name = Release;
866866
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Sources/AttributedTextView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ import UIKit
8484
self.isEditable = false
8585
}
8686
if let color = _attributer?.linkColor {
87-
self.linkTextAttributes = [NSAttributedStringKey.foregroundColor.rawValue: color]
87+
self.linkTextAttributes = [NSAttributedString.Key.foregroundColor: color]
8888
}
8989
}
9090
}

0 commit comments

Comments
 (0)