Skip to content

Commit a5b8bd3

Browse files
committed
Update to CocoaPods (1.1.1)
1 parent 4d5f771 commit a5b8bd3

File tree

4 files changed

+46
-39
lines changed

4 files changed

+46
-39
lines changed

Example/Example.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
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 */ = {

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 "jazzy", "~> 0.7.0"
66
gem "pry"
77
gem "rake"

Gemfile.lock

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,101 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (5.0.0.1)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
CFPropertyList (2.3.4)
5+
activesupport (4.2.7.1)
66
i18n (~> 0.7)
7+
json (~> 1.7, >= 1.7.7)
78
minitest (~> 5.1)
9+
thread_safe (~> 0.3, >= 0.3.4)
810
tzinfo (~> 1.1)
9-
claide (1.0.0)
10-
cocoapods (1.0.1)
11-
activesupport (>= 4.0.2)
12-
claide (>= 1.0.0, < 2.0)
13-
cocoapods-core (= 1.0.1)
14-
cocoapods-deintegrate (>= 1.0.0, < 2.0)
15-
cocoapods-downloader (>= 1.0.0, < 2.0)
11+
claide (1.0.1)
12+
cocoapods (1.1.1)
13+
activesupport (>= 4.0.2, < 5)
14+
claide (>= 1.0.1, < 2.0)
15+
cocoapods-core (= 1.1.1)
16+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
17+
cocoapods-downloader (>= 1.1.2, < 2.0)
1618
cocoapods-plugins (>= 1.0.0, < 2.0)
1719
cocoapods-search (>= 1.0.0, < 2.0)
1820
cocoapods-stats (>= 1.0.0, < 2.0)
19-
cocoapods-trunk (>= 1.0.0, < 2.0)
20-
cocoapods-try (>= 1.0.0, < 2.0)
21+
cocoapods-trunk (>= 1.1.1, < 2.0)
22+
cocoapods-try (>= 1.1.0, < 2.0)
2123
colored (~> 1.2)
2224
escape (~> 0.0.4)
23-
fourflusher (~> 0.3.0)
24-
molinillo (~> 0.4.5)
25+
fourflusher (~> 2.0.1)
26+
gh_inspector (~> 1.0)
27+
molinillo (~> 0.5.1)
2528
nap (~> 1.0)
26-
xcodeproj (>= 1.1.0, < 2.0)
27-
cocoapods-core (1.0.1)
28-
activesupport (>= 4.0.2)
29+
xcodeproj (>= 1.3.3, < 2.0)
30+
cocoapods-core (1.1.1)
31+
activesupport (>= 4.0.2, < 5)
2932
fuzzy_match (~> 2.0.4)
3033
nap (~> 1.0)
3134
cocoapods-deintegrate (1.0.1)
32-
cocoapods-downloader (1.1.1)
35+
cocoapods-downloader (1.1.3)
3336
cocoapods-plugins (1.0.0)
3437
nap
3538
cocoapods-search (1.0.0)
3639
cocoapods-stats (1.0.0)
37-
cocoapods-trunk (1.0.0)
40+
cocoapods-trunk (1.1.2)
3841
nap (>= 0.8, < 2.0)
3942
netrc (= 0.7.8)
4043
cocoapods-try (1.1.0)
4144
coderay (1.1.1)
4245
colored (1.2)
43-
concurrent-ruby (1.0.2)
4446
escape (0.0.4)
45-
fourflusher (0.3.2)
47+
fourflusher (2.0.1)
4648
fuzzy_match (2.0.4)
49+
gh_inspector (1.0.2)
4750
i18n (0.7.0)
48-
jazzy (0.7.2)
51+
jazzy (0.7.3)
4952
cocoapods (~> 1.0)
5053
mustache (~> 0.99)
5154
open4
5255
redcarpet (~> 3.2)
5356
rouge (~> 1.5)
5457
sass (~> 3.4)
5558
sqlite3 (~> 1.3)
56-
xcinvoke (~> 0.2.1)
57-
liferaft (0.0.4)
59+
xcinvoke (~> 0.3.0)
60+
json (1.8.3)
61+
liferaft (0.0.6)
5862
method_source (0.8.2)
59-
minitest (5.9.0)
60-
molinillo (0.4.5)
63+
minitest (5.10.1)
64+
molinillo (0.5.4)
6165
mustache (0.99.8)
66+
nanaimo (0.2.3)
6267
nap (1.1.0)
6368
netrc (0.7.8)
6469
open4 (1.3.4)
6570
pry (0.10.4)
6671
coderay (~> 1.1.0)
6772
method_source (~> 0.8.1)
6873
slop (~> 3.4)
69-
rake (11.2.2)
70-
redcarpet (3.3.4)
74+
rake (12.0.0)
75+
redcarpet (3.4.0)
7176
rouge (1.11.1)
72-
sass (3.4.22)
77+
sass (3.4.23)
7378
slop (3.6.0)
74-
sqlite3 (1.3.11)
79+
sqlite3 (1.3.12)
7580
thread_safe (0.3.5)
7681
tzinfo (1.2.2)
7782
thread_safe (~> 0.1)
78-
xcinvoke (0.2.1)
79-
liferaft (~> 0.0.4)
80-
xcodeproj (1.3.1)
83+
xcinvoke (0.3.0)
84+
liferaft (~> 0.0.6)
85+
xcodeproj (1.4.2)
86+
CFPropertyList (~> 2.3.3)
8187
activesupport (>= 3)
82-
claide (>= 1.0.0, < 2.0)
88+
claide (>= 1.0.1, < 2.0)
8389
colored (~> 1.2)
84-
xcpretty (0.2.2)
90+
nanaimo (~> 0.2.3)
91+
xcpretty (0.2.4)
8592
rouge (~> 1.8)
8693

8794
PLATFORMS
8895
ruby
8996

9097
DEPENDENCIES
91-
cocoapods (~> 1.0.0)
98+
cocoapods (~> 1.1.0)
9299
jazzy (~> 0.7.0)
93100
pry
94101
rake
@@ -98,4 +105,4 @@ RUBY VERSION
98105
ruby 2.3.1p112
99106

100107
BUNDLED WITH
101-
1.12.5
108+
1.13.6

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: 41c0babd8a8e47d9dc4741ac44d6bb453b85139d
1717

18-
COCOAPODS: 1.0.1
18+
COCOAPODS: 1.1.1

0 commit comments

Comments
 (0)