Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 39ee612

Browse files
alexaubryalexaubry
authored
Merge pull request #16 from alexaubry/swift5
Upgrade to Swift 5 and improve performance
2 parents 7fb27bf + ab7aaa9 commit 39ee612

8 files changed

Lines changed: 258 additions & 180 deletions

File tree

‎HTMLString.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
55BFFFD71F59574E00F13633 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BFFFD61F59574E00F13633 /* TestData.swift */; };
1111
55BFFFD81F59574E00F13633 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BFFFD61F59574E00F13633 /* TestData.swift */; };
1212
55BFFFD91F59574E00F13633 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BFFFD61F59574E00F13633 /* TestData.swift */; };
13+
5E0A736B224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
14+
5E0A736C224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
15+
5E0A736D224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
16+
5E0A736E224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
1317
5E441EB81E525FCA0041CF34 /* HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* HTMLString.swift */; };
1418
5E441EB91E525FCA0041CF34 /* Mappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* Mappings.swift */; };
1519
5E441EE21E5260980041CF34 /* HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* HTMLString.swift */; };
@@ -24,10 +28,6 @@
2428
5E441F181E5263C70041CF34 /* HTMLStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* HTMLStringTests.swift */; };
2529
5E441F191E5263C70041CF34 /* HTMLStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* HTMLStringTests.swift */; };
2630
5E441F1A1E5263C70041CF34 /* HTMLStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* HTMLStringTests.swift */; };
27-
5E441F1C1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
28-
5E441F1D1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
29-
5E441F1E1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
30-
5E441F1F1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
3131
5E441F201E526DD70041CF34 /* NSString+HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* NSString+HTMLString.swift */; };
3232
5E441F211E526DD70041CF34 /* NSString+HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* NSString+HTMLString.swift */; };
3333
5E441F221E526DD70041CF34 /* NSString+HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* NSString+HTMLString.swift */; };
@@ -60,6 +60,7 @@
6060

6161
/* Begin PBXFileReference section */
6262
55BFFFD61F59574E00F13633 /* TestData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TestData.swift; path = HTMLStringTests/TestData.swift; sourceTree = "<group>"; };
63+
5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = HTMLEscapes.plist; sourceTree = "<group>"; };
6364
5E441EA91E525F2D0041CF34 /* HTMLString.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = HTMLString.plist; path = Configs/HTMLString.plist; sourceTree = "<group>"; };
6465
5E441EAA1E525F340041CF34 /* HTMLStringTests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = HTMLStringTests.plist; path = Configs/HTMLStringTests.plist; sourceTree = "<group>"; };
6566
5E441EB01E525FB70041CF34 /* HTMLString.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLString.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -69,7 +70,6 @@
6970
5E441EEF1E5262540041CF34 /* HTMLString-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLString-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
7071
5E441EFE1E5262910041CF34 /* HTMLString-tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLString-tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
7172
5E441F0D1E52629D0041CF34 /* HTMLString-macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLString-macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
72-
5E441F1B1E5265070041CF34 /* Deprecated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = HTMLString/Deprecated.swift; sourceTree = "<group>"; };
7373
OBJ_10 /* Mappings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Mappings.swift; path = HTMLString/Mappings.swift; sourceTree = "<group>"; };
7474
OBJ_11 /* NSString+HTMLString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "NSString+HTMLString.swift"; path = "HTMLString/NSString+HTMLString.swift"; sourceTree = "<group>"; };
7575
OBJ_14 /* HTMLStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HTMLStringTests.swift; path = HTMLStringTests/HTMLStringTests.swift; sourceTree = "<group>"; };
@@ -133,6 +133,14 @@
133133
/* End PBXFrameworksBuildPhase section */
134134

135135
/* Begin PBXGroup section */
136+
5E0A7369224CFC2300DCD41D /* Resources */ = {
137+
isa = PBXGroup;
138+
children = (
139+
5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */,
140+
);
141+
path = Resources;
142+
sourceTree = "<group>";
143+
};
136144
5E441EA61E525EFC0041CF34 /* Configs */ = {
137145
isa = PBXGroup;
138146
children = (
@@ -185,6 +193,7 @@
185193
isa = PBXGroup;
186194
children = (
187195
OBJ_6 /* Package.swift */,
196+
5E0A7369224CFC2300DCD41D /* Resources */,
188197
OBJ_7 /* Sources */,
189198
OBJ_12 /* Tests */,
190199
5E441EA61E525EFC0041CF34 /* Configs */,
@@ -198,7 +207,6 @@
198207
OBJ_9 /* HTMLString.swift */,
199208
OBJ_11 /* NSString+HTMLString.swift */,
200209
OBJ_10 /* Mappings.swift */,
201-
5E441F1B1E5265070041CF34 /* Deprecated.swift */,
202210
);
203211
path = Sources;
204212
sourceTree = "<group>";
@@ -414,6 +422,7 @@
414422
developmentRegion = English;
415423
hasScannedForEncodings = 0;
416424
knownRegions = (
425+
English,
417426
en,
418427
);
419428
mainGroup = OBJ_5;
@@ -437,27 +446,31 @@
437446
isa = PBXResourcesBuildPhase;
438447
buildActionMask = 2147483647;
439448
files = (
449+
5E0A736B224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
440450
);
441451
runOnlyForDeploymentPostprocessing = 0;
442452
};
443453
5E441EBE1E525FE50041CF34 /* Resources */ = {
444454
isa = PBXResourcesBuildPhase;
445455
buildActionMask = 2147483647;
446456
files = (
457+
5E0A736E224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
447458
);
448459
runOnlyForDeploymentPostprocessing = 0;
449460
};
450461
5E441ECB1E5260280041CF34 /* Resources */ = {
451462
isa = PBXResourcesBuildPhase;
452463
buildActionMask = 2147483647;
453464
files = (
465+
5E0A736D224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
454466
);
455467
runOnlyForDeploymentPostprocessing = 0;
456468
};
457469
5E441ED81E52604A0041CF34 /* Resources */ = {
458470
isa = PBXResourcesBuildPhase;
459471
buildActionMask = 2147483647;
460472
files = (
473+
5E0A736C224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
461474
);
462475
runOnlyForDeploymentPostprocessing = 0;
463476
};
@@ -489,7 +502,6 @@
489502
isa = PBXSourcesBuildPhase;
490503
buildActionMask = 2147483647;
491504
files = (
492-
5E441F1C1E5265070041CF34 /* Deprecated.swift in Sources */,
493505
5E441EB91E525FCA0041CF34 /* Mappings.swift in Sources */,
494506
5E441EB81E525FCA0041CF34 /* HTMLString.swift in Sources */,
495507
5E441F201E526DD70041CF34 /* NSString+HTMLString.swift in Sources */,
@@ -500,7 +512,6 @@
500512
isa = PBXSourcesBuildPhase;
501513
buildActionMask = 2147483647;
502514
files = (
503-
5E441F1D1E5265070041CF34 /* Deprecated.swift in Sources */,
504515
5E441EE31E5260980041CF34 /* Mappings.swift in Sources */,
505516
5E441EE21E5260980041CF34 /* HTMLString.swift in Sources */,
506517
5E441F211E526DD70041CF34 /* NSString+HTMLString.swift in Sources */,
@@ -511,7 +522,6 @@
511522
isa = PBXSourcesBuildPhase;
512523
buildActionMask = 2147483647;
513524
files = (
514-
5E441F1E1E5265070041CF34 /* Deprecated.swift in Sources */,
515525
5E441EE61E5260990041CF34 /* Mappings.swift in Sources */,
516526
5E441EE51E5260990041CF34 /* HTMLString.swift in Sources */,
517527
5E441F221E526DD70041CF34 /* NSString+HTMLString.swift in Sources */,
@@ -522,7 +532,6 @@
522532
isa = PBXSourcesBuildPhase;
523533
buildActionMask = 2147483647;
524534
files = (
525-
5E441F1F1E5265070041CF34 /* Deprecated.swift in Sources */,
526535
5E441EE91E5260990041CF34 /* Mappings.swift in Sources */,
527536
5E441EE81E5260990041CF34 /* HTMLString.swift in Sources */,
528537
5E441F231E526DD80041CF34 /* NSString+HTMLString.swift in Sources */,
@@ -633,7 +642,7 @@
633642
SKIP_INSTALL = YES;
634643
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
635644
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
636-
SWIFT_VERSION = 4.0;
645+
SWIFT_VERSION = 5.0;
637646
TARGETED_DEVICE_FAMILY = "1,2";
638647
VERSIONING_SYSTEM = "apple-generic";
639648
VERSION_INFO_PREFIX = "";
@@ -692,7 +701,7 @@
692701
SKIP_INSTALL = YES;
693702
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
694703
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
695-
SWIFT_VERSION = 4.0;
704+
SWIFT_VERSION = 5.0;
696705
TARGETED_DEVICE_FAMILY = "1,2";
697706
VALIDATE_PRODUCT = YES;
698707
VERSIONING_SYSTEM = "apple-generic";
@@ -754,7 +763,7 @@
754763
SKIP_INSTALL = YES;
755764
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
756765
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
757-
SWIFT_VERSION = 4.0;
766+
SWIFT_VERSION = 5.0;
758767
TARGETED_DEVICE_FAMILY = 4;
759768
VERSIONING_SYSTEM = "apple-generic";
760769
VERSION_INFO_PREFIX = "";
@@ -812,7 +821,7 @@
812821
SKIP_INSTALL = YES;
813822
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
814823
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
815-
SWIFT_VERSION = 4.0;
824+
SWIFT_VERSION = 5.0;
816825
TARGETED_DEVICE_FAMILY = 4;
817826
VALIDATE_PRODUCT = YES;
818827
VERSIONING_SYSTEM = "apple-generic";
@@ -875,7 +884,7 @@
875884
SKIP_INSTALL = YES;
876885
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
877886
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
878-
SWIFT_VERSION = 4.0;
887+
SWIFT_VERSION = 5.0;
879888
TARGETED_DEVICE_FAMILY = 3;
880889
TVOS_DEPLOYMENT_TARGET = 9.0;
881890
VERSIONING_SYSTEM = "apple-generic";
@@ -933,7 +942,7 @@
933942
SKIP_INSTALL = YES;
934943
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
935944
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
936-
SWIFT_VERSION = 4.0;
945+
SWIFT_VERSION = 5.0;
937946
TARGETED_DEVICE_FAMILY = 3;
938947
TVOS_DEPLOYMENT_TARGET = 9.0;
939948
VALIDATE_PRODUCT = YES;
@@ -996,7 +1005,7 @@
9961005
SKIP_INSTALL = YES;
9971006
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
9981007
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
999-
SWIFT_VERSION = 4.0;
1008+
SWIFT_VERSION = 5.0;
10001009
VERSIONING_SYSTEM = "apple-generic";
10011010
VERSION_INFO_PREFIX = "";
10021011
};
@@ -1052,7 +1061,7 @@
10521061
SKIP_INSTALL = YES;
10531062
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
10541063
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1055-
SWIFT_VERSION = 4.0;
1064+
SWIFT_VERSION = 5.0;
10561065
VERSIONING_SYSTEM = "apple-generic";
10571066
VERSION_INFO_PREFIX = "";
10581067
};
@@ -1106,7 +1115,7 @@
11061115
SDKROOT = iphoneos;
11071116
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
11081117
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1109-
SWIFT_VERSION = 4.0;
1118+
SWIFT_VERSION = 5.0;
11101119
};
11111120
name = Debug;
11121121
};
@@ -1154,7 +1163,7 @@
11541163
SDKROOT = iphoneos;
11551164
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
11561165
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1157-
SWIFT_VERSION = 4.0;
1166+
SWIFT_VERSION = 5.0;
11581167
VALIDATE_PRODUCT = YES;
11591168
};
11601169
name = Release;
@@ -1207,7 +1216,7 @@
12071216
SDKROOT = appletvos;
12081217
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
12091218
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1210-
SWIFT_VERSION = 4.0;
1219+
SWIFT_VERSION = 5.0;
12111220
TVOS_DEPLOYMENT_TARGET = 10.1;
12121221
};
12131222
name = Debug;
@@ -1256,7 +1265,7 @@
12561265
SDKROOT = appletvos;
12571266
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12581267
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1259-
SWIFT_VERSION = 4.0;
1268+
SWIFT_VERSION = 5.0;
12601269
TVOS_DEPLOYMENT_TARGET = 10.1;
12611270
VALIDATE_PRODUCT = YES;
12621271
};
@@ -1310,7 +1319,7 @@
13101319
PROVISIONING_PROFILE_SPECIFIER = "";
13111320
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
13121321
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1313-
SWIFT_VERSION = 4.0;
1322+
SWIFT_VERSION = 5.0;
13141323
};
13151324
name = Debug;
13161325
};
@@ -1358,7 +1367,7 @@
13581367
PROVISIONING_PROFILE_SPECIFIER = "";
13591368
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13601369
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1361-
SWIFT_VERSION = 4.0;
1370+
SWIFT_VERSION = 5.0;
13621371
};
13631372
name = Release;
13641373
};

‎HTMLString.xcodeproj/xcshareddata/xcbaselines/5E441F0C1E52629D0041CF34.xcbaseline/44D264C5-4B6D-41EE-8335-D58F674700AF.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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>classNames</key>
6+
<dict>
7+
<key>HTMLStringTests</key>
8+
<dict>
9+
<key>testEscapingPerformance()</key>
10+
<dict>
11+
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
12+
<dict>
13+
<key>baselineAverage</key>
14+
<real>0.00027498</real>
15+
<key>baselineIntegrationDisplayName</key>
16+
<string>Local Baseline</string>
17+
</dict>
18+
</dict>
19+
</dict>
20+
</dict>
21+
</dict>
22+
</plist>

‎HTMLString.xcodeproj/xcshareddata/xcbaselines/5E441F0C1E52629D0041CF34.xcbaseline/Info.plist‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,30 @@
44
<dict>
55
<key>runDestinationsByUUID</key>
66
<dict>
7+
<key>44D264C5-4B6D-41EE-8335-D58F674700AF</key>
8+
<dict>
9+
<key>localComputer</key>
10+
<dict>
11+
<key>busSpeedInMHz</key>
12+
<integer>100</integer>
13+
<key>cpuCount</key>
14+
<integer>1</integer>
15+
<key>cpuKind</key>
16+
<string>Intel Core i7</string>
17+
<key>cpuSpeedInMHz</key>
18+
<integer>2600</integer>
19+
<key>logicalCPUCoresPerPackage</key>
20+
<integer>8</integer>
21+
<key>modelCode</key>
22+
<string>MacBookPro13,3</string>
23+
<key>physicalCPUCoresPerPackage</key>
24+
<integer>4</integer>
25+
<key>platformIdentifier</key>
26+
<string>com.apple.platform.macosx</string>
27+
</dict>
28+
<key>targetArchitecture</key>
29+
<string>x86_64</string>
30+
</dict>
731
<key>7FA55448-AB0F-4791-AC13-4CC5FF89FBC1</key>
832
<dict>
933
<key>localComputer</key>

‎Resources/HTMLEscapes.plist‎

39.2 KB
Binary file not shown.

‎Sources/HTMLString/Deprecated.swift‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)