Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Commit 9353dc9

Browse files
author
ivanlisovyi
committed
Add support for Xcode 11.5
1 parent 169502a commit 9353dc9

File tree

9 files changed

+75
-76
lines changed

9 files changed

+75
-76
lines changed

‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
5.0

‎Carlos.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@
11651165
attributes = {
11661166
LastSwiftMigration = 0700;
11671167
LastSwiftUpdateCheck = 0730;
1168-
LastUpgradeCheck = 1020;
1168+
LastUpgradeCheck = 1150;
11691169
ORGANIZATIONNAME = WeltN24;
11701170
TargetAttributes = {
11711171
5216CD0B1BC04B43005B729F = {
@@ -1178,7 +1178,7 @@
11781178
};
11791179
52635A651B4F110500F187EE = {
11801180
CreatedOnToolsVersion = 6.4;
1181-
LastSwiftMigration = 0920;
1181+
LastSwiftMigration = 1150;
11821182
ProvisioningStyle = Manual;
11831183
};
11841184
52CF0A9D1B9203730061022D = {
@@ -1823,7 +1823,7 @@
18231823
PRODUCT_NAME = "$(TARGET_NAME)";
18241824
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
18251825
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1826-
SWIFT_VERSION = 4.2;
1826+
SWIFT_VERSION = 5.0;
18271827
};
18281828
name = Debug;
18291829
};
@@ -1843,7 +1843,7 @@
18431843
PRODUCT_BUNDLE_IDENTIFIER = "de.weltn24.$(PRODUCT_NAME:rfc1034identifier)";
18441844
PRODUCT_NAME = "$(TARGET_NAME)";
18451845
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1846-
SWIFT_VERSION = 4.2;
1846+
SWIFT_VERSION = 5.0;
18471847
};
18481848
name = Release;
18491849
};
@@ -1921,7 +1921,7 @@
19211921
buildSettings = {
19221922
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
19231923
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1924-
CODE_SIGN_IDENTITY = "";
1924+
CODE_SIGN_IDENTITY = "-";
19251925
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Mac Developer";
19261926
COMBINE_HIDPI_IMAGES = YES;
19271927
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1944,7 +1944,7 @@
19441944
buildSettings = {
19451945
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
19461946
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1947-
CODE_SIGN_IDENTITY = "";
1947+
CODE_SIGN_IDENTITY = "-";
19481948
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Mac Developer";
19491949
COMBINE_HIDPI_IMAGES = YES;
19501950
FRAMEWORK_SEARCH_PATHS = (

‎Carlos.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
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>

‎Carlos.xcodeproj/xcshareddata/xcschemes/Carlos (Watch).xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "AD64D93C1B8DE58300C783D3"
34+
BuildableName = "CarlosWatch.framework"
35+
BlueprintName = "CarlosWatch"
36+
ReferencedContainer = "container:Carlos.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "AD64D93C1B8DE58300C783D3"
56-
BuildableName = "CarlosWatch.framework"
57-
BlueprintName = "CarlosWatch"
58-
ReferencedContainer = "container:Carlos.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -80,8 +78,6 @@
8078
ReferencedContainer = "container:Carlos.xcodeproj">
8179
</BuildableReference>
8280
</MacroExpansion>
83-
<AdditionalOptions>
84-
</AdditionalOptions>
8581
</LaunchAction>
8682
<ProfileAction
8783
buildConfiguration = "Release"

‎Carlos.xcodeproj/xcshareddata/xcschemes/Carlos.xcscheme

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,7 +40,27 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
codeCoverageEnabled = "YES"
45+
onlyGenerateCoverageForSpecifiedTargets = "YES">
46+
<MacroExpansion>
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
50+
BuildableName = "Carlos.framework"
51+
BlueprintName = "Carlos"
52+
ReferencedContainer = "container:Carlos.xcodeproj">
53+
</BuildableReference>
54+
</MacroExpansion>
55+
<CodeCoverageTargets>
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
59+
BuildableName = "Carlos.framework"
60+
BlueprintName = "Carlos"
61+
ReferencedContainer = "container:Carlos.xcodeproj">
62+
</BuildableReference>
63+
</CodeCoverageTargets>
4464
<Testables>
4565
<TestableReference
4666
skipped = "NO">
@@ -63,17 +83,6 @@
6383
</BuildableReference>
6484
</TestableReference>
6585
</Testables>
66-
<MacroExpansion>
67-
<BuildableReference
68-
BuildableIdentifier = "primary"
69-
BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
70-
BuildableName = "Carlos.framework"
71-
BlueprintName = "Carlos"
72-
ReferencedContainer = "container:Carlos.xcodeproj">
73-
</BuildableReference>
74-
</MacroExpansion>
75-
<AdditionalOptions>
76-
</AdditionalOptions>
7786
</TestAction>
7887
<LaunchAction
7988
buildConfiguration = "Debug"
@@ -94,8 +103,6 @@
94103
ReferencedContainer = "container:Carlos.xcodeproj">
95104
</BuildableReference>
96105
</MacroExpansion>
97-
<AdditionalOptions>
98-
</AdditionalOptions>
99106
</LaunchAction>
100107
<ProfileAction
101108
buildConfiguration = "Release"

‎Carlos.xcodeproj/xcshareddata/xcschemes/CarlosMac.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "52CF0A9D1B9203730061022D"
34+
BuildableName = "CarlosMac.framework"
35+
BlueprintName = "CarlosMac"
36+
ReferencedContainer = "container:Carlos.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "52CF0A9D1B9203730061022D"
56-
BuildableName = "CarlosMac.framework"
57-
BlueprintName = "CarlosMac"
58-
ReferencedContainer = "container:Carlos.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -80,8 +78,6 @@
8078
ReferencedContainer = "container:Carlos.xcodeproj">
8179
</BuildableReference>
8280
</MacroExpansion>
83-
<AdditionalOptions>
84-
</AdditionalOptions>
8581
</LaunchAction>
8682
<ProfileAction
8783
buildConfiguration = "Release"

‎Carlos.xcodeproj/xcshareddata/xcschemes/CarlosTv.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "52D805A91BC03995000F0733"
34+
BuildableName = "CarlosTv.framework"
35+
BlueprintName = "CarlosTv"
36+
ReferencedContainer = "container:Carlos.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "52D805A91BC03995000F0733"
56-
BuildableName = "CarlosTv.framework"
57-
BlueprintName = "CarlosTv"
58-
ReferencedContainer = "container:Carlos.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -80,8 +78,6 @@
8078
ReferencedContainer = "container:Carlos.xcodeproj">
8179
</BuildableReference>
8280
</MacroExpansion>
83-
<AdditionalOptions>
84-
</AdditionalOptions>
8581
</LaunchAction>
8682
<ProfileAction
8783
buildConfiguration = "Release"

‎Carlos/Extensions.swift

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@ import CommonCrypto
33

44
extension String {
55
func MD5Data() -> Data? {
6-
guard let messageData = self.data(using:.utf8) else {
7-
return nil
6+
let data = Data(self.utf8)
7+
let hash = data.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) -> [UInt8] in
8+
var hash = [UInt8](repeating: 0, count: Int(CC_MD5_DIGEST_LENGTH))
9+
CC_MD5(bytes.baseAddress, CC_LONG(data.count), &hash)
10+
return hash
811
}
912

10-
var digestData = Data(count: Int(CC_MD5_DIGEST_LENGTH))
11-
_ = digestData.withUnsafeMutableBytes { digestBytes in
12-
messageData.withUnsafeBytes { messageBytes in
13-
CC_MD5(messageBytes, CC_LONG(messageData.count), digestBytes)
14-
}
15-
}
16-
17-
return digestData
13+
return Data(bytes: hash, count: hash.count)
1814
}
1915

2016
func MD5String() -> String {

‎Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v8.0.0"
2-
github "Quick/Quick" "v2.0.0"
1+
github "Quick/Nimble" "v8.1.1"
2+
github "Quick/Quick" "v3.0.0"
33
github "spring-media/PiedPiper" "de0a7ba6284bd7a45e1c543de548c7440f8cc98f"

0 commit comments

Comments
 (0)