Skip to content

Commit cc64c3c

Browse files
Vkt0rVkt0r
authored
Merge pull request httpswift#438 from Vkt0r/danger-fix
Update the project for Xcode 11.1
2 parents c4a9768 + 39aba16 commit cc64c3c

File tree

12 files changed

+144
-86
lines changed

12 files changed

+144
-86
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ jobs:
44

55
Danger:
66
macos:
7-
xcode: 10.2.0
7+
xcode: 11.1.0
88
steps:
99
- checkout
1010
- run:
1111
name: Set Ruby Version
12-
command: echo "ruby-2.4" > ~/.ruby-version
12+
command: echo "ruby-2.5.6" > ~/.ruby-version
1313
- restore_cache:
1414
key: 1-gems-{{ checksum "Gemfile.lock" }}
1515
- run:
@@ -31,7 +31,7 @@ jobs:
3131
TEST_REPORTS: /tmp/test-results
3232
LANG: en_US.UTF-8
3333
macos:
34-
xcode: 10.2.0
34+
xcode: 11.1.0
3535
steps:
3636
- checkout
3737
- run:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ DerivedData
2727

2828
.build/
2929
Packages/
30+
/XCode/.DS_Store

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file. Changes not
2121
## Added
2222

2323
- Add the `trailing_whitespace` rule in Swiftlint and autocorrect all the source files. ([#421](https://github.com/httpswift/swifter/pull/421)) by [@Vkt0r](https://github.com/Vkt0r)
24+
- Update the project for Xcode 11.1. ([#438](https://github.com/httpswift/swifter/pull/438)) by [@Vkt0r](https://github.com/Vkt0r)
2425

2526
## Changed
2627

‎Gemfile.lock‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.2)
5-
public_suffix (>= 2.0.2, < 4.0)
6-
claide (1.0.2)
4+
addressable (2.7.0)
5+
public_suffix (>= 2.0.2, < 5.0)
6+
claide (1.0.3)
77
claide-plugins (0.9.2)
88
cork
99
nap
1010
open4 (~> 1.3)
1111
colored2 (3.1.2)
1212
cork (0.3.0)
1313
colored2 (~> 3.1)
14-
danger (6.0.6)
14+
danger (6.1.0)
1515
claide (~> 1.0)
1616
claide-plugins (>= 0.9.2)
1717
colored2 (~> 3.1)
1818
cork (~> 0.1)
1919
faraday (~> 0.9)
20-
faraday-http-cache (~> 1.0)
20+
faraday-http-cache (~> 2.0)
2121
git (~> 1.5)
2222
kramdown (~> 2.0)
2323
kramdown-parser-gfm (~> 1.0)
2424
no_proxy_fix
2525
octokit (~> 4.7)
2626
terminal-table (~> 1)
27-
danger-swiftlint (0.20.1)
27+
danger-swiftlint (0.23.0)
2828
danger
2929
rake (> 10)
3030
thor (~> 0.19)
31-
faraday (0.15.4)
31+
faraday (0.17.0)
3232
multipart-post (>= 1.2, < 3)
33-
faraday-http-cache (1.3.1)
33+
faraday-http-cache (2.0.0)
3434
faraday (~> 0.8)
3535
git (1.5.0)
3636
kramdown (2.1.0)
37-
kramdown-parser-gfm (1.0.1)
37+
kramdown-parser-gfm (1.1.0)
3838
kramdown (~> 2.0)
39-
multipart-post (2.0.0)
39+
multipart-post (2.1.1)
4040
nap (1.1.0)
4141
no_proxy_fix (0.1.2)
4242
octokit (4.14.0)
4343
sawyer (~> 0.8.0, >= 0.5.3)
4444
open4 (1.3.4)
45-
public_suffix (3.0.3)
46-
rake (12.3.2)
47-
sawyer (0.8.1)
48-
addressable (>= 2.3.5, < 2.6)
49-
faraday (~> 0.8, < 1.0)
45+
public_suffix (4.0.1)
46+
rake (13.0.0)
47+
sawyer (0.8.2)
48+
addressable (>= 2.3.5)
49+
faraday (> 0.8, < 2.0)
5050
terminal-table (1.8.0)
5151
unicode-display_width (~> 1.1, >= 1.1.1)
5252
thor (0.20.3)
53-
unicode-display_width (1.5.0)
53+
unicode-display_width (1.6.0)
5454

5555
PLATFORMS
5656
ruby
@@ -60,4 +60,4 @@ DEPENDENCIES
6060
danger-swiftlint
6161

6262
BUNDLED WITH
63-
1.16.5
63+
1.17.2

‎XCode/Swifter.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@
629629
isa = PBXProject;
630630
attributes = {
631631
LastSwiftUpdateCheck = 1010;
632-
LastUpgradeCheck = 1020;
632+
LastUpgradeCheck = 1110;
633633
ORGANIZATIONNAME = "Damian Kołakowski";
634634
TargetAttributes = {
635635
043660C121FED34100497989 = {
@@ -655,11 +655,11 @@
655655
};
656656
7C839B6D19422CFF003A6950 = {
657657
CreatedOnToolsVersion = 6.0;
658-
LastSwiftMigration = 1000;
658+
LastSwiftMigration = 1110;
659659
};
660660
7CA4813A19A2EA8D0030B30D = {
661661
CreatedOnToolsVersion = 6.0;
662-
LastSwiftMigration = 1000;
662+
LastSwiftMigration = 1110;
663663
};
664664
7CCD875B1C66099B0068099B = {
665665
CreatedOnToolsVersion = 7.2;
@@ -1371,7 +1371,7 @@
13711371
SWIFT_COMPILATION_MODE = singlefile;
13721372
SWIFT_OBJC_BRIDGING_HEADER = "";
13731373
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1374-
SWIFT_VERSION = 4.2;
1374+
SWIFT_VERSION = 5.0;
13751375
TARGETED_DEVICE_FAMILY = "1,2";
13761376
};
13771377
name = Debug;
@@ -1390,16 +1390,17 @@
13901390
SDKROOT = iphoneos;
13911391
SWIFT_COMPILATION_MODE = wholemodule;
13921392
SWIFT_OBJC_BRIDGING_HEADER = "";
1393-
SWIFT_VERSION = 4.2;
1393+
SWIFT_VERSION = 5.0;
13941394
TARGETED_DEVICE_FAMILY = "1,2";
13951395
};
13961396
name = Release;
13971397
};
13981398
7CA4813F19A2EA8D0030B30D /* Debug */ = {
13991399
isa = XCBuildConfiguration;
14001400
buildSettings = {
1401-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
1401+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
14021402
CLANG_ENABLE_MODULES = YES;
1403+
CODE_SIGN_IDENTITY = "-";
14031404
GCC_PREPROCESSOR_DEFINITIONS = (
14041405
"DEBUG=1",
14051406
"$(inherited)",
@@ -1411,22 +1412,23 @@
14111412
SDKROOT = macosx;
14121413
SWIFT_OBJC_BRIDGING_HEADER = "";
14131414
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1414-
SWIFT_VERSION = 4.2;
1415+
SWIFT_VERSION = 5.0;
14151416
};
14161417
name = Debug;
14171418
};
14181419
7CA4814019A2EA8D0030B30D /* Release */ = {
14191420
isa = XCBuildConfiguration;
14201421
buildSettings = {
1421-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
1422+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
14221423
CLANG_ENABLE_MODULES = YES;
1424+
CODE_SIGN_IDENTITY = "-";
14231425
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14241426
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
14251427
MTL_ENABLE_DEBUG_INFO = NO;
14261428
PRODUCT_NAME = "$(TARGET_NAME)";
14271429
SDKROOT = macosx;
14281430
SWIFT_OBJC_BRIDGING_HEADER = "";
1429-
SWIFT_VERSION = 4.2;
1431+
SWIFT_VERSION = 5.0;
14301432
};
14311433
name = Release;
14321434
};

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterMac.xcscheme‎

Lines changed: 10 additions & 14 deletions
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 = "1110"
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 = "7AE893FA1C0512C400A29F63"
34+
BuildableName = "Swifter.framework"
35+
BlueprintName = "SwifterMac"
36+
ReferencedContainer = "container:Swifter.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "7AE893FA1C0512C400A29F63"
46-
BuildableName = "Swifter.framework"
47-
BlueprintName = "SwifterMac"
48-
ReferencedContainer = "container:Swifter.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Swifter.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterSampleOSX.xcscheme‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1110"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "7CA4813A19A2EA8D0030B30D"
18+
BuildableName = "SwifterSampleOSX"
19+
BlueprintName = "SwifterSampleOSX"
20+
ReferencedContainer = "container:Swifter.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "7CA4813A19A2EA8D0030B30D"
48+
BuildableName = "SwifterSampleOSX"
49+
BlueprintName = "SwifterSampleOSX"
50+
ReferencedContainer = "container:Swifter.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "7CA4813A19A2EA8D0030B30D"
65+
BuildableName = "SwifterSampleOSX"
66+
BlueprintName = "SwifterSampleOSX"
67+
ReferencedContainer = "container:Swifter.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOS.xcscheme‎

Lines changed: 10 additions & 14 deletions
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 = "1110"
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 = "7AE893E61C05127900A29F63"
34+
BuildableName = "Swifter.framework"
35+
BlueprintName = "SwifteriOS"
36+
ReferencedContainer = "container:Swifter.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "7AE893E61C05127900A29F63"
46-
BuildableName = "Swifter.framework"
47-
BlueprintName = "SwifteriOS"
48-
ReferencedContainer = "container:Swifter.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Release"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Swifter.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

0 commit comments

Comments
 (0)