Skip to content

Commit a8fb63f

Browse files
bcylinbcylin
committed
Upgrade to CocoaPods (1.1.1)
1 parent 409b991 commit a8fb63f

5 files changed

Lines changed: 42 additions & 32 deletions

File tree

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
);
270270
runOnlyForDeploymentPostprocessing = 0;
271271
shellPath = /bin/sh;
272-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
272+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
273273
showEnvVarsInLog = 0;
274274
};
275275
B5C50ADD1C917F4A0059032B /* Swift Lint */ = {
@@ -359,6 +359,7 @@
359359
B548C5C91C8E91B0009D5AEE /* Debug */ = {
360360
isa = XCBuildConfiguration;
361361
buildSettings = {
362+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
362363
INFOPLIST_FILE = ICInputAccessoryUITests/Info.plist;
363364
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
364365
PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryUITests;
@@ -372,6 +373,7 @@
372373
B548C5CA1C8E91B0009D5AEE /* Release */ = {
373374
isa = XCBuildConfiguration;
374375
buildSettings = {
376+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
375377
INFOPLIST_FILE = ICInputAccessoryUITests/Info.plist;
376378
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
377379
PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryUITests;
@@ -386,6 +388,7 @@
386388
B5E9F90B1C8D3B6E00443DC7 /* Debug */ = {
387389
isa = XCBuildConfiguration;
388390
buildSettings = {
391+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
389392
ALWAYS_SEARCH_USER_PATHS = NO;
390393
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
391394
CLANG_CXX_LIBRARY = "libc++";
@@ -432,6 +435,7 @@
432435
B5E9F90C1C8D3B6E00443DC7 /* Release */ = {
433436
isa = XCBuildConfiguration;
434437
buildSettings = {
438+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
435439
ALWAYS_SEARCH_USER_PATHS = NO;
436440
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
437441
CLANG_CXX_LIBRARY = "libc++";
@@ -472,7 +476,7 @@
472476
isa = XCBuildConfiguration;
473477
baseConfigurationReference = CA708B7D49E7D80A75ED81E3 /* Pods-Example.debug.xcconfig */;
474478
buildSettings = {
475-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
479+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
476480
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
477481
INFOPLIST_FILE = Example/Info.plist;
478482
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -488,7 +492,7 @@
488492
isa = XCBuildConfiguration;
489493
baseConfigurationReference = FE1A89C8A77ED0438A206A24 /* Pods-Example.release.xcconfig */;
490494
buildSettings = {
491-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
495+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
492496
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
493497
INFOPLIST_FILE = Example/Info.plist;
494498
IPHONEOS_DEPLOYMENT_TARGET = 8.0;

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "http://rubygems.org"
22
ruby "2.3.1"
33

4-
gem "cocoapods", "~> 1.0.0"
4+
gem "cocoapods", "~> 1.1.0"
55
gem "danger", "~> 3.5.0"
66
gem "jazzy", "~> 0.7.0"
77
gem "pry"

‎Gemfile.lock‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,55 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (5.0.0.1)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (4.2.7.1)
65
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
89
tzinfo (~> 1.1)
910
addressable (2.4.0)
10-
claide (1.0.0)
11+
claide (1.0.1)
1112
claide-plugins (0.9.2)
1213
cork
1314
nap
1415
open4 (~> 1.3)
15-
cocoapods (1.0.1)
16-
activesupport (>= 4.0.2)
17-
claide (>= 1.0.0, < 2.0)
18-
cocoapods-core (= 1.0.1)
19-
cocoapods-deintegrate (>= 1.0.0, < 2.0)
20-
cocoapods-downloader (>= 1.0.0, < 2.0)
16+
cocoapods (1.1.1)
17+
activesupport (>= 4.0.2, < 5)
18+
claide (>= 1.0.1, < 2.0)
19+
cocoapods-core (= 1.1.1)
20+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
21+
cocoapods-downloader (>= 1.1.2, < 2.0)
2122
cocoapods-plugins (>= 1.0.0, < 2.0)
2223
cocoapods-search (>= 1.0.0, < 2.0)
2324
cocoapods-stats (>= 1.0.0, < 2.0)
24-
cocoapods-trunk (>= 1.0.0, < 2.0)
25-
cocoapods-try (>= 1.0.0, < 2.0)
25+
cocoapods-trunk (>= 1.1.1, < 2.0)
26+
cocoapods-try (>= 1.1.0, < 2.0)
2627
colored (~> 1.2)
2728
escape (~> 0.0.4)
28-
fourflusher (~> 0.3.0)
29-
molinillo (~> 0.4.5)
29+
fourflusher (~> 2.0.1)
30+
gh_inspector (~> 1.0)
31+
molinillo (~> 0.5.1)
3032
nap (~> 1.0)
31-
xcodeproj (>= 1.1.0, < 2.0)
32-
cocoapods-core (1.0.1)
33-
activesupport (>= 4.0.2)
33+
xcodeproj (>= 1.3.3, < 2.0)
34+
cocoapods-core (1.1.1)
35+
activesupport (>= 4.0.2, < 5)
3436
fuzzy_match (~> 2.0.4)
3537
nap (~> 1.0)
3638
cocoapods-deintegrate (1.0.1)
37-
cocoapods-downloader (1.1.1)
39+
cocoapods-downloader (1.1.2)
3840
cocoapods-plugins (1.0.0)
3941
nap
4042
cocoapods-search (1.0.0)
4143
cocoapods-stats (1.0.0)
42-
cocoapods-trunk (1.0.0)
44+
cocoapods-trunk (1.1.1)
4345
nap (>= 0.8, < 2.0)
4446
netrc (= 0.7.8)
4547
cocoapods-try (1.1.0)
4648
coderay (1.1.1)
4749
colored (1.2)
48-
concurrent-ruby (1.0.2)
4950
cork (0.2.0)
5051
colored (~> 1.2)
51-
danger (3.5.0)
52+
danger (3.5.5)
5253
claide (~> 1.0)
5354
claide-plugins (>= 0.9.2)
5455
colored (~> 1.2)
@@ -65,8 +66,9 @@ GEM
6566
multipart-post (>= 1.2, < 3)
6667
faraday-http-cache (1.3.1)
6768
faraday (~> 0.8)
68-
fourflusher (0.3.2)
69+
fourflusher (2.0.1)
6970
fuzzy_match (2.0.4)
71+
gh_inspector (1.0.2)
7072
git (1.3.0)
7173
gitlab (3.7.0)
7274
httparty (~> 0.13.0)
@@ -89,13 +91,13 @@ GEM
8991
liferaft (0.0.4)
9092
method_source (0.8.2)
9193
minitest (5.9.1)
92-
molinillo (0.4.5)
94+
molinillo (0.5.2)
9395
multi_xml (0.5.5)
9496
multipart-post (2.0.0)
9597
mustache (0.99.8)
9698
nap (1.1.0)
9799
netrc (0.7.8)
98-
octokit (4.3.0)
100+
octokit (4.4.0)
99101
sawyer (~> 0.7.0, >= 0.5.3)
100102
open4 (1.3.4)
101103
pry (0.10.4)
@@ -119,18 +121,18 @@ GEM
119121
unicode-display_width (1.1.1)
120122
xcinvoke (0.2.1)
121123
liferaft (~> 0.0.4)
122-
xcodeproj (1.3.1)
124+
xcodeproj (1.3.3)
123125
activesupport (>= 3)
124-
claide (>= 1.0.0, < 2.0)
126+
claide (>= 1.0.1, < 2.0)
125127
colored (~> 1.2)
126-
xcpretty (0.2.3)
128+
xcpretty (0.2.4)
127129
rouge (~> 1.8)
128130

129131
PLATFORMS
130132
ruby
131133

132134
DEPENDENCIES
133-
cocoapods (~> 1.0.0)
135+
cocoapods (~> 1.1.0)
134136
danger (~> 3.5.0)
135137
jazzy (~> 0.7.0)
136138
pry

‎ICInputAccessory.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
B56BC4301C89A7EA00C20AD6 /* Debug */ = {
184184
isa = XCBuildConfiguration;
185185
buildSettings = {
186+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
186187
ALWAYS_SEARCH_USER_PATHS = NO;
187188
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
188189
CLANG_CXX_LIBRARY = "libc++";
@@ -234,6 +235,7 @@
234235
B56BC4311C89A7EA00C20AD6 /* Release */ = {
235236
isa = XCBuildConfiguration;
236237
buildSettings = {
238+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
237239
ALWAYS_SEARCH_USER_PATHS = NO;
238240
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
239241
CLANG_CXX_LIBRARY = "libc++";
@@ -278,6 +280,7 @@
278280
B56BC4331C89A7EA00C20AD6 /* Debug */ = {
279281
isa = XCBuildConfiguration;
280282
buildSettings = {
283+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
281284
CLANG_ENABLE_MODULES = YES;
282285
DEFINES_MODULE = YES;
283286
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -297,6 +300,7 @@
297300
B56BC4341C89A7EA00C20AD6 /* Release */ = {
298301
isa = XCBuildConfiguration;
299302
buildSettings = {
303+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
300304
CLANG_ENABLE_MODULES = YES;
301305
DEFINES_MODULE = YES;
302306
DYLIB_COMPATIBILITY_VERSION = 1;

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ SPEC CHECKSUMS:
1515

1616
PODFILE CHECKSUM: 0d87bbf65bdc7c4668475091d7495d880f7fc618
1717

18-
COCOAPODS: 1.0.1
18+
COCOAPODS: 1.1.1

0 commit comments

Comments
 (0)