Skip to content

Commit 80a2ebd

Browse files
committed
update for swift 5
1 parent a949085 commit 80a2ebd

File tree

10 files changed

+104
-57
lines changed

10 files changed

+104
-57
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

AttributedTextView.playground/Contents.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,3 @@ attributedText = textView1.attributedText // View the details for this -->
118118

119119
textView1.attributer = "My name is: <b>Edwin</b><br/>With a bulet list<br/><ul><li>item 1</li><li>item 2</li></ul>".html
120120
attributedText = textView1.attributedText // View the details for this -->
121-
122-
123-
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>

AttributedTextView.playground/timeline.xctimeline

Lines changed: 70 additions & 25 deletions
Large diffs are not rendered by default.

AttributedTextView.podspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AttributedTextView'
3-
s.version = '1.3.0'
3+
s.version = '1.4.0'
44
s.license = { :type => "MIT", :file => "LICENSE" }
55
s.summary = 'Easiest way to create an attributed UILabel or UITextView (with support for multiple links and HTML)'
66
s.homepage = 'https://github.com/evermeer/AttributedTextView'
@@ -10,7 +10,9 @@ Pod::Spec.new do |s|
1010
s.platforms = { :ios => "8.0" }
1111
s.requires_arc = true
1212
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
13-
s.swift_version = '4.2'
13+
s.swift_version = '5.0'
14+
s.swift_versions = ['4.0', '4.2', '5.0']
15+
1416
s.frameworks = "Foundation", "UIKit"
1517
s.source_files = "Sources/*.swift"
1618
end

AttributedTextView.xcodeproj/project.pbxproj

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
7FDAE1371DEF192A00CB46B6 /* Sample3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sample3.png; sourceTree = "<group>"; };
8787
7FDAE1381DEF192A00CB46B6 /* Sample4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sample4.png; sourceTree = "<group>"; };
8888
7FF12E28215501FA005769A5 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
89-
7FF12E2A215501FA005769A5 /* .swift-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".swift-version"; sourceTree = "<group>"; };
9089
7FF12E2B21550219005769A5 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
9190
/* End PBXFileReference section */
9291

@@ -134,7 +133,6 @@
134133
isa = PBXGroup;
135134
children = (
136135
7FF12E2B21550219005769A5 /* .gitignore */,
137-
7FF12E2A215501FA005769A5 /* .swift-version */,
138136
7FF12E28215501FA005769A5 /* .swiftlint.yml */,
139137
3549BB161DA3890B00C63030 /* Sources */,
140138
7F652A761DEE09E900A1E61F /* Demo */,
@@ -362,12 +360,12 @@
362360
isa = PBXProject;
363361
attributes = {
364362
LastSwiftUpdateCheck = 0810;
365-
LastUpgradeCheck = 0930;
363+
LastUpgradeCheck = 1020;
366364
ORGANIZATIONNAME = evermeer;
367365
TargetAttributes = {
368366
3549BB201DA389CD00C63030 = {
369367
CreatedOnToolsVersion = 8.0;
370-
LastSwiftMigration = 0900;
368+
LastSwiftMigration = 1020;
371369
ProvisioningStyle = Automatic;
372370
};
373371
3549BB2D1DA389DB00C63030 = {
@@ -387,14 +385,14 @@
387385
};
388386
7F652A741DEE09E900A1E61F = {
389387
CreatedOnToolsVersion = 8.1;
390-
DevelopmentTeam = 6Z7QY98HTS;
388+
LastSwiftMigration = 1020;
391389
ProvisioningStyle = Automatic;
392390
};
393391
};
394392
};
395393
buildConfigurationList = 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "AttributedTextView" */;
396394
compatibilityVersion = "Xcode 3.2";
397-
developmentRegion = English;
395+
developmentRegion = en;
398396
hasScannedForEncodings = 0;
399397
knownRegions = (
400398
en,
@@ -551,6 +549,7 @@
551549
isa = XCBuildConfiguration;
552550
buildSettings = {
553551
ALWAYS_SEARCH_USER_PATHS = NO;
552+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
554553
CLANG_ANALYZER_NONNULL = YES;
555554
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
556555
CLANG_CXX_LIBRARY = "libc++";
@@ -614,6 +613,7 @@
614613
isa = XCBuildConfiguration;
615614
buildSettings = {
616615
ALWAYS_SEARCH_USER_PATHS = NO;
616+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
617617
CLANG_ANALYZER_NONNULL = YES;
618618
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
619619
CLANG_CXX_LIBRARY = "libc++";
@@ -682,8 +682,7 @@
682682
PRODUCT_NAME = AttributedTextView;
683683
SKIP_INSTALL = YES;
684684
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
685-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
686-
SWIFT_VERSION = 4.2;
685+
SWIFT_VERSION = 5.0;
687686
};
688687
name = Debug;
689688
};
@@ -702,8 +701,7 @@
702701
PRODUCT_BUNDLE_IDENTIFIER = "nl.evict.attributedtextview.AttributedTextView-iOS";
703702
PRODUCT_NAME = AttributedTextView;
704703
SKIP_INSTALL = YES;
705-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
706-
SWIFT_VERSION = 4.2;
704+
SWIFT_VERSION = 5.0;
707705
};
708706
name = Release;
709707
};
@@ -726,7 +724,7 @@
726724
SKIP_INSTALL = YES;
727725
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
728726
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
729-
SWIFT_VERSION = 4.2;
727+
SWIFT_VERSION = 5.0;
730728
TARGETED_DEVICE_FAMILY = 4;
731729
WATCHOS_DEPLOYMENT_TARGET = 3.0;
732730
};
@@ -750,7 +748,7 @@
750748
SDKROOT = watchos;
751749
SKIP_INSTALL = YES;
752750
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
753-
SWIFT_VERSION = 4.2;
751+
SWIFT_VERSION = 5.0;
754752
TARGETED_DEVICE_FAMILY = 4;
755753
WATCHOS_DEPLOYMENT_TARGET = 3.0;
756754
};
@@ -777,7 +775,7 @@
777775
SKIP_INSTALL = YES;
778776
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
779777
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
780-
SWIFT_VERSION = 4.2;
778+
SWIFT_VERSION = 5.0;
781779
};
782780
name = Debug;
783781
};
@@ -801,7 +799,7 @@
801799
SDKROOT = macosx;
802800
SKIP_INSTALL = YES;
803801
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
804-
SWIFT_VERSION = 4.2;
802+
SWIFT_VERSION = 5.0;
805803
};
806804
name = Release;
807805
};
@@ -823,7 +821,7 @@
823821
SKIP_INSTALL = YES;
824822
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
825823
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
826-
SWIFT_VERSION = 4.2;
824+
SWIFT_VERSION = 5.0;
827825
TARGETED_DEVICE_FAMILY = 3;
828826
TVOS_DEPLOYMENT_TARGET = 10.0;
829827
};
@@ -846,7 +844,7 @@
846844
SDKROOT = appletvos;
847845
SKIP_INSTALL = YES;
848846
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
849-
SWIFT_VERSION = 4.2;
847+
SWIFT_VERSION = 5.0;
850848
TARGETED_DEVICE_FAMILY = 3;
851849
TVOS_DEPLOYMENT_TARGET = 10.0;
852850
};
@@ -856,29 +854,27 @@
856854
isa = XCBuildConfiguration;
857855
buildSettings = {
858856
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
859-
DEVELOPMENT_TEAM = 6Z7QY98HTS;
857+
DEVELOPMENT_TEAM = "";
860858
INFOPLIST_FILE = Demo/Info.plist;
861859
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
862860
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(CONFIGURATION_BUILD_DIR)";
863861
PRODUCT_BUNDLE_IDENTIFIER = nl.evict.Demo;
864862
PRODUCT_NAME = "$(TARGET_NAME)";
865-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
866-
SWIFT_VERSION = 4.2;
863+
SWIFT_VERSION = 5.0;
867864
};
868865
name = Debug;
869866
};
870867
7F652A851DEE09E900A1E61F /* Release */ = {
871868
isa = XCBuildConfiguration;
872869
buildSettings = {
873870
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
874-
DEVELOPMENT_TEAM = 6Z7QY98HTS;
871+
DEVELOPMENT_TEAM = "";
875872
INFOPLIST_FILE = Demo/Info.plist;
876873
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
877874
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(CONFIGURATION_BUILD_DIR)";
878875
PRODUCT_BUNDLE_IDENTIFIER = nl.evict.Demo;
879876
PRODUCT_NAME = "$(TARGET_NAME)";
880-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
881-
SWIFT_VERSION = 4.2;
877+
SWIFT_VERSION = 5.0;
882878
};
883879
name = Release;
884880
};

AttributedTextView.xcodeproj/xcshareddata/xcschemes/AttributedTextView-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

AttributedTextView.xcodeproj/xcshareddata/xcschemes/AttributedTextView-macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

AttributedTextView.xcodeproj/xcshareddata/xcschemes/AttributedTextView-tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

AttributedTextView.xcodeproj/xcshareddata/xcschemes/AttributedTextView-watchOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)