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

Skip to content

Upgrade to Swift 5 and improve performance #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexaubry merged 1 commit into from
Apr 25, 2019
Merged

Upgrade to Swift 5 and improve performance #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 33 additions & 24 deletions HTMLString.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
55BFFFD71F59574E00F13633 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BFFFD61F59574E00F13633 /* TestData.swift */; };
55BFFFD81F59574E00F13633 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BFFFD61F59574E00F13633 /* TestData.swift */; };
55BFFFD91F59574E00F13633 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BFFFD61F59574E00F13633 /* TestData.swift */; };
5E0A736B224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
5E0A736C224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
5E0A736D224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
5E0A736E224CFC2300DCD41D /* HTMLEscapes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */; };
5E441EB81E525FCA0041CF34 /* HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* HTMLString.swift */; };
5E441EB91E525FCA0041CF34 /* Mappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* Mappings.swift */; };
5E441EE21E5260980041CF34 /* HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* HTMLString.swift */; };
Expand All @@ -24,10 +28,6 @@
5E441F181E5263C70041CF34 /* HTMLStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* HTMLStringTests.swift */; };
5E441F191E5263C70041CF34 /* HTMLStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* HTMLStringTests.swift */; };
5E441F1A1E5263C70041CF34 /* HTMLStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* HTMLStringTests.swift */; };
5E441F1C1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
5E441F1D1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
5E441F1E1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
5E441F1F1E5265070041CF34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E441F1B1E5265070041CF34 /* Deprecated.swift */; };
5E441F201E526DD70041CF34 /* NSString+HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* NSString+HTMLString.swift */; };
5E441F211E526DD70041CF34 /* NSString+HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* NSString+HTMLString.swift */; };
5E441F221E526DD70041CF34 /* NSString+HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* NSString+HTMLString.swift */; };
Expand Down Expand Up @@ -60,6 +60,7 @@

/* Begin PBXFileReference section */
55BFFFD61F59574E00F13633 /* TestData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TestData.swift; path = HTMLStringTests/TestData.swift; sourceTree = "<group>"; };
5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = HTMLEscapes.plist; sourceTree = "<group>"; };
5E441EA91E525F2D0041CF34 /* HTMLString.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = HTMLString.plist; path = Configs/HTMLString.plist; sourceTree = "<group>"; };
5E441EAA1E525F340041CF34 /* HTMLStringTests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = HTMLStringTests.plist; path = Configs/HTMLStringTests.plist; sourceTree = "<group>"; };
5E441EB01E525FB70041CF34 /* HTMLString.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLString.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -69,7 +70,6 @@
5E441EEF1E5262540041CF34 /* HTMLString-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLString-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5E441EFE1E5262910041CF34 /* HTMLString-tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLString-tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5E441F0D1E52629D0041CF34 /* HTMLString-macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLString-macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5E441F1B1E5265070041CF34 /* Deprecated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = HTMLString/Deprecated.swift; sourceTree = "<group>"; };
OBJ_10 /* Mappings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Mappings.swift; path = HTMLString/Mappings.swift; sourceTree = "<group>"; };
OBJ_11 /* NSString+HTMLString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "NSString+HTMLString.swift"; path = "HTMLString/NSString+HTMLString.swift"; sourceTree = "<group>"; };
OBJ_14 /* HTMLStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HTMLStringTests.swift; path = HTMLStringTests/HTMLStringTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -133,6 +133,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
5E0A7369224CFC2300DCD41D /* Resources */ = {
isa = PBXGroup;
children = (
5E0A736A224CFC2300DCD41D /* HTMLEscapes.plist */,
);
path = Resources;
sourceTree = "<group>";
};
5E441EA61E525EFC0041CF34 /* Configs */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -185,6 +193,7 @@
isa = PBXGroup;
children = (
OBJ_6 /* Package.swift */,
5E0A7369224CFC2300DCD41D /* Resources */,
OBJ_7 /* Sources */,
OBJ_12 /* Tests */,
5E441EA61E525EFC0041CF34 /* Configs */,
Expand All @@ -198,7 +207,6 @@
OBJ_9 /* HTMLString.swift */,
OBJ_11 /* NSString+HTMLString.swift */,
OBJ_10 /* Mappings.swift */,
5E441F1B1E5265070041CF34 /* Deprecated.swift */,
);
path = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -414,6 +422,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = OBJ_5;
Expand All @@ -437,27 +446,31 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E0A736B224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5E441EBE1E525FE50041CF34 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E0A736E224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5E441ECB1E5260280041CF34 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E0A736D224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5E441ED81E52604A0041CF34 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E0A736C224CFC2300DCD41D /* HTMLEscapes.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -489,7 +502,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E441F1C1E5265070041CF34 /* Deprecated.swift in Sources */,
5E441EB91E525FCA0041CF34 /* Mappings.swift in Sources */,
5E441EB81E525FCA0041CF34 /* HTMLString.swift in Sources */,
5E441F201E526DD70041CF34 /* NSString+HTMLString.swift in Sources */,
Expand All @@ -500,7 +512,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E441F1D1E5265070041CF34 /* Deprecated.swift in Sources */,
5E441EE31E5260980041CF34 /* Mappings.swift in Sources */,
5E441EE21E5260980041CF34 /* HTMLString.swift in Sources */,
5E441F211E526DD70041CF34 /* NSString+HTMLString.swift in Sources */,
Expand All @@ -511,7 +522,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E441F1E1E5265070041CF34 /* Deprecated.swift in Sources */,
5E441EE61E5260990041CF34 /* Mappings.swift in Sources */,
5E441EE51E5260990041CF34 /* HTMLString.swift in Sources */,
5E441F221E526DD70041CF34 /* NSString+HTMLString.swift in Sources */,
Expand All @@ -522,7 +532,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E441F1F1E5265070041CF34 /* Deprecated.swift in Sources */,
5E441EE91E5260990041CF34 /* Mappings.swift in Sources */,
5E441EE81E5260990041CF34 /* HTMLString.swift in Sources */,
5E441F231E526DD80041CF34 /* NSString+HTMLString.swift in Sources */,
Expand Down Expand Up @@ -633,7 +642,7 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -692,7 +701,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -754,7 +763,7 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -812,7 +821,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -875,7 +884,7 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -933,7 +942,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -996,7 +1005,7 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -1052,7 +1061,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -1106,7 +1115,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -1154,7 +1163,7 @@
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down Expand Up @@ -1207,7 +1216,7 @@
SDKROOT = appletvos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.1;
};
name = Debug;
Expand Down Expand Up @@ -1256,7 +1265,7 @@
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.1;
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -1310,7 +1319,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -1358,7 +1367,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
22 changes: 22 additions & 0 deletions ...cbaselines/5E441F0C1E52629D0041CF34.xcbaseline/44D264C5-4B6D-41EE-8335-D58F674700AF.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>classNames</key>
<dict>
<key>HTMLStringTests</key>
<dict>
<key>testEscapingPerformance()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.00027498</real>
<key>baselineIntegrationDisplayName</key>
<string>Local Baseline</string>
</dict>
</dict>
</dict>
</dict>
</dict>
</plist>
24 changes: 24 additions & 0 deletions HTMLString.xcodeproj/xcshareddata/xcbaselines/5E441F0C1E52629D0041CF34.xcbaseline/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,30 @@
<dict>
<key>runDestinationsByUUID</key>
<dict>
<key>44D264C5-4B6D-41EE-8335-D58F674700AF</key>
<dict>
<key>localComputer</key>
<dict>
<key>busSpeedInMHz</key>
<integer>100</integer>
<key>cpuCount</key>
<integer>1</integer>
<key>cpuKind</key>
<string>Intel Core i7</string>
<key>cpuSpeedInMHz</key>
<integer>2600</integer>
<key>logicalCPUCoresPerPackage</key>
<integer>8</integer>
<key>modelCode</key>
<string>MacBookPro13,3</string>
<key>physicalCPUCoresPerPackage</key>
<integer>4</integer>
<key>platformIdentifier</key>
<string>com.apple.platform.macosx</string>
</dict>
<key>targetArchitecture</key>
<string>x86_64</string>
</dict>
<key>7FA55448-AB0F-4791-AC13-4CC5FF89FBC1</key>
<dict>
<key>localComputer</key>
Expand Down
Binary file added Resources/HTMLEscapes.plist
View file
Open in desktop
Binary file not shown.
55 changes: 0 additions & 55 deletions Sources/HTMLString/Deprecated.swift
View file
Open in desktop

This file was deleted.

Loading