Skip to content

Commit 176a421

Browse files
tmspzztmspzz
authored
Merge pull request #154 from phatblat/update-dependencies
⬆️ Update dev dependencies
2 parents ab68611 + 973ddd3 commit 176a421

File tree

9 files changed

+63
-53
lines changed

9 files changed

+63
-53
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ aliases:
99
script:
1010
- rm .swift-version
1111
- gem update cocoapods
12-
- pod repo update master
12+
- pod setup
1313
- pod lib lint --verbose
1414
os: osx
1515
language: objective-c

‎Cartfile.private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "jspahrsummers/xcconfigs" ~> 0.9
1+
github "jspahrsummers/xcconfigs" ~> 1.0
22
github "Quick/Quick" ~> 2.0
33
github "Quick/Nimble" ~> 8.0

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
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"
3-
github "jspahrsummers/xcconfigs" "0.9"
1+
github "Quick/Nimble" "v8.1.1"
2+
github "Quick/Quick" "v2.2.1"
3+
github "jspahrsummers/xcconfigs" "1.0"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble updated 76 files

‎Carthage/Checkouts/Quick‎

Submodule Quick updated 84 files

‎Carthage/Checkouts/xcconfigs‎

‎Commandant.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
D00CCE2F1A2075F700109F8C /* Option.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00CCE2E1A2075F700109F8C /* Option.swift */; };
2626
D0BF14FB1A4C8957003147BC /* HelpCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BF14FA1A4C8957003147BC /* HelpCommand.swift */; };
2727
D8169D871ACB942D00923FB0 /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8169D861ACB942D00923FB0 /* Switch.swift */; };
28+
F88F259424F34E9700EC60D5 /* macOS-Application.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */; };
29+
F88F259524F34E9700EC60D5 /* macOS-Framework.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */; };
30+
F88F259624F34E9700EC60D5 /* macOS-StaticLibrary.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F88F259024F34E9700EC60D5 /* macOS-StaticLibrary.xcconfig */; };
31+
F88F259724F34E9700EC60D5 /* macOS-Base.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F88F259124F34E9700EC60D5 /* macOS-Base.xcconfig */; };
32+
F88F259824F34E9700EC60D5 /* macOS-XCTest.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F88F259224F34E9700EC60D5 /* macOS-XCTest.xcconfig */; };
33+
F88F259924F34E9700EC60D5 /* macOS-DynamicLibrary.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F88F259324F34E9700EC60D5 /* macOS-DynamicLibrary.xcconfig */; };
2834
/* End PBXBuildFile section */
2935

3036
/* Begin PBXContainerItemProxy section */
@@ -63,11 +69,6 @@
6369
D00CCE041A20719500109F8C /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
6470
D00CCE051A20719500109F8C /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
6571
D00CCE061A20719500109F8C /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
66-
D00CCE081A20719500109F8C /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
67-
D00CCE091A20719500109F8C /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
68-
D00CCE0A1A20719500109F8C /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
69-
D00CCE0B1A20719500109F8C /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
70-
D00CCE0C1A20719500109F8C /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
7172
D00CCE0D1A20719500109F8C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
7273
D00CCE221A2073DA00109F8C /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7374
D00CCE231A2073DA00109F8C /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -78,6 +79,12 @@
7879
D00CCE2E1A2075F700109F8C /* Option.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Option.swift; sourceTree = "<group>"; };
7980
D0BF14FA1A4C8957003147BC /* HelpCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpCommand.swift; sourceTree = "<group>"; };
8081
D8169D861ACB942D00923FB0 /* Switch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Switch.swift; sourceTree = "<group>"; };
82+
F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
83+
F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
84+
F88F259024F34E9700EC60D5 /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
85+
F88F259124F34E9700EC60D5 /* macOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
86+
F88F259224F34E9700EC60D5 /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
87+
F88F259324F34E9700EC60D5 /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
8188
/* End PBXFileReference section */
8289

8390
/* Begin PBXFrameworksBuildPhase section */
@@ -170,7 +177,7 @@
170177
children = (
171178
D00CCDF71A20719500109F8C /* Base */,
172179
D00CCE021A20719500109F8C /* iOS */,
173-
D00CCE071A20719500109F8C /* Mac OS X */,
180+
F88F258D24F34E9700EC60D5 /* macOS */,
174181
D00CCE0D1A20719500109F8C /* README.md */,
175182
);
176183
name = Configuration;
@@ -219,18 +226,6 @@
219226
path = iOS;
220227
sourceTree = "<group>";
221228
};
222-
D00CCE071A20719500109F8C /* Mac OS X */ = {
223-
isa = PBXGroup;
224-
children = (
225-
D00CCE081A20719500109F8C /* Mac-Application.xcconfig */,
226-
D00CCE091A20719500109F8C /* Mac-Base.xcconfig */,
227-
D00CCE0A1A20719500109F8C /* Mac-DynamicLibrary.xcconfig */,
228-
D00CCE0B1A20719500109F8C /* Mac-Framework.xcconfig */,
229-
D00CCE0C1A20719500109F8C /* Mac-StaticLibrary.xcconfig */,
230-
);
231-
path = "Mac OS X";
232-
sourceTree = "<group>";
233-
};
234229
D0BF14F81A4C892E003147BC /* Core */ = {
235230
isa = PBXGroup;
236231
children = (
@@ -255,6 +250,19 @@
255250
name = "Built-in Commands";
256251
sourceTree = "<group>";
257252
};
253+
F88F258D24F34E9700EC60D5 /* macOS */ = {
254+
isa = PBXGroup;
255+
children = (
256+
F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */,
257+
F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */,
258+
F88F259024F34E9700EC60D5 /* macOS-StaticLibrary.xcconfig */,
259+
F88F259124F34E9700EC60D5 /* macOS-Base.xcconfig */,
260+
F88F259224F34E9700EC60D5 /* macOS-XCTest.xcconfig */,
261+
F88F259324F34E9700EC60D5 /* macOS-DynamicLibrary.xcconfig */,
262+
);
263+
path = macOS;
264+
sourceTree = "<group>";
265+
};
258266
/* End PBXGroup section */
259267

260268
/* Begin PBXHeadersBuildPhase section */
@@ -313,7 +321,7 @@
313321
attributes = {
314322
LastSwiftMigration = 0700;
315323
LastSwiftUpdateCheck = 0700;
316-
LastUpgradeCheck = 1020;
324+
LastUpgradeCheck = 1160;
317325
ORGANIZATIONNAME = Carthage;
318326
TargetAttributes = {
319327
D00CCDD81A20717400109F8C = {
@@ -350,6 +358,12 @@
350358
isa = PBXResourcesBuildPhase;
351359
buildActionMask = 2147483647;
352360
files = (
361+
F88F259424F34E9700EC60D5 /* macOS-Application.xcconfig in Resources */,
362+
F88F259724F34E9700EC60D5 /* macOS-Base.xcconfig in Resources */,
363+
F88F259924F34E9700EC60D5 /* macOS-DynamicLibrary.xcconfig in Resources */,
364+
F88F259524F34E9700EC60D5 /* macOS-Framework.xcconfig in Resources */,
365+
F88F259824F34E9700EC60D5 /* macOS-XCTest.xcconfig in Resources */,
366+
F88F259624F34E9700EC60D5 /* macOS-StaticLibrary.xcconfig in Resources */,
353367
);
354368
runOnlyForDeploymentPostprocessing = 0;
355369
};
@@ -447,7 +461,7 @@
447461
};
448462
D00CCDF01A20717400109F8C /* Debug */ = {
449463
isa = XCBuildConfiguration;
450-
baseConfigurationReference = D00CCE0B1A20719500109F8C /* Mac-Framework.xcconfig */;
464+
baseConfigurationReference = F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */;
451465
buildSettings = {
452466
CLANG_ENABLE_MODULES = YES;
453467
DEFINES_MODULE = YES;
@@ -464,7 +478,7 @@
464478
};
465479
D00CCDF11A20717400109F8C /* Release */ = {
466480
isa = XCBuildConfiguration;
467-
baseConfigurationReference = D00CCE0B1A20719500109F8C /* Mac-Framework.xcconfig */;
481+
baseConfigurationReference = F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */;
468482
buildSettings = {
469483
CLANG_ENABLE_MODULES = YES;
470484
DEFINES_MODULE = YES;
@@ -480,7 +494,7 @@
480494
};
481495
D00CCDF31A20717400109F8C /* Debug */ = {
482496
isa = XCBuildConfiguration;
483-
baseConfigurationReference = D00CCE081A20719500109F8C /* Mac-Application.xcconfig */;
497+
baseConfigurationReference = F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */;
484498
buildSettings = {
485499
FRAMEWORK_SEARCH_PATHS = (
486500
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -495,7 +509,7 @@
495509
};
496510
D00CCDF41A20717400109F8C /* Release */ = {
497511
isa = XCBuildConfiguration;
498-
baseConfigurationReference = D00CCE081A20719500109F8C /* Mac-Application.xcconfig */;
512+
baseConfigurationReference = F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */;
499513
buildSettings = {
500514
FRAMEWORK_SEARCH_PATHS = (
501515
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -530,7 +544,7 @@
530544
};
531545
D00CCE121A2072AB00109F8C /* Profile */ = {
532546
isa = XCBuildConfiguration;
533-
baseConfigurationReference = D00CCE0B1A20719500109F8C /* Mac-Framework.xcconfig */;
547+
baseConfigurationReference = F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */;
534548
buildSettings = {
535549
CLANG_ENABLE_MODULES = YES;
536550
DEFINES_MODULE = YES;
@@ -546,7 +560,7 @@
546560
};
547561
D00CCE131A2072AB00109F8C /* Profile */ = {
548562
isa = XCBuildConfiguration;
549-
baseConfigurationReference = D00CCE081A20719500109F8C /* Mac-Application.xcconfig */;
563+
baseConfigurationReference = F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */;
550564
buildSettings = {
551565
FRAMEWORK_SEARCH_PATHS = (
552566
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -581,7 +595,7 @@
581595
};
582596
D00CCE151A2072BD00109F8C /* Test */ = {
583597
isa = XCBuildConfiguration;
584-
baseConfigurationReference = D00CCE0B1A20719500109F8C /* Mac-Framework.xcconfig */;
598+
baseConfigurationReference = F88F258F24F34E9700EC60D5 /* macOS-Framework.xcconfig */;
585599
buildSettings = {
586600
CLANG_ENABLE_MODULES = YES;
587601
DEFINES_MODULE = YES;
@@ -598,7 +612,7 @@
598612
};
599613
D00CCE161A2072BD00109F8C /* Test */ = {
600614
isa = XCBuildConfiguration;
601-
baseConfigurationReference = D00CCE081A20719500109F8C /* Mac-Application.xcconfig */;
615+
baseConfigurationReference = F88F258E24F34E9700EC60D5 /* macOS-Application.xcconfig */;
602616
buildSettings = {
603617
FRAMEWORK_SEARCH_PATHS = (
604618
"$(DEVELOPER_FRAMEWORKS_DIR)",

‎Commandant.xcodeproj/xcshareddata/xcschemes/Commandant.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 = "1160"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "D00CCDD81A20717400109F8C"
48+
BuildableName = "Commandant.framework"
49+
BlueprintName = "Commandant"
50+
ReferencedContainer = "container:Commandant.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "D00CCDD81A20717400109F8C"
60-
BuildableName = "Commandant.framework"
61-
BlueprintName = "Commandant"
62-
ReferencedContainer = "container:Commandant.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:Commandant.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Profile"

‎Package.resolved‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)