Skip to content

Commit d0bb28b

Browse files
authored
Merge pull request #132 from layoutBox/udpate_cocoapods
Update cocoapods to 1.7
2 parents f15edbf + e81fd37 commit d0bb28b

File tree

5 files changed

+25
-51
lines changed

5 files changed

+25
-51
lines changed

Example/FlexLayoutSample.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
files = (
434434
);
435435
inputPaths = (
436-
"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
436+
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
437437
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
438438
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
439439
);
@@ -444,7 +444,7 @@
444444
);
445445
runOnlyForDeploymentPostprocessing = 0;
446446
shellPath = /bin/sh;
447-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh\"\n";
447+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh\"\n";
448448
showEnvVarsInLog = 0;
449449
};
450450
DF1F2A1E1F17D11700BA1B97 /* Run Swiftlint */ = {

FlexLayout.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@
394394
files = (
395395
);
396396
inputPaths = (
397-
"${SRCROOT}/Pods/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-frameworks.sh",
397+
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-frameworks.sh",
398398
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
399399
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
400400
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
@@ -407,7 +407,7 @@
407407
);
408408
runOnlyForDeploymentPostprocessing = 0;
409409
shellPath = /bin/sh;
410-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-frameworks.sh\"\n";
410+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-frameworks.sh\"\n";
411411
showEnvVarsInLog = 0;
412412
};
413413
/* End PBXShellScriptBuildPhase section */

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22
gem 'synx'
3-
gem 'cocoapods', '~> 1.5.0'
4-
gem 'jazzy'
3+
gem 'cocoapods', '~> 1.7'
4+
# gem 'jazzy'
55
gem 'fastlane'

Gemfile.lock

+17-43
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.0)
5-
activesupport (4.2.11)
5+
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
@@ -13,30 +13,30 @@ GEM
1313
babosa (1.0.2)
1414
claide (1.0.2)
1515
clamp (0.6.5)
16-
cocoapods (1.5.3)
16+
cocoapods (1.7.1)
1717
activesupport (>= 4.0.2, < 5)
1818
claide (>= 1.0.2, < 2.0)
19-
cocoapods-core (= 1.5.3)
20-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
21-
cocoapods-downloader (>= 1.2.0, < 2.0)
19+
cocoapods-core (= 1.7.1)
20+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
21+
cocoapods-downloader (>= 1.2.2, < 2.0)
2222
cocoapods-plugins (>= 1.0.0, < 2.0)
2323
cocoapods-search (>= 1.0.0, < 2.0)
2424
cocoapods-stats (>= 1.0.0, < 2.0)
25-
cocoapods-trunk (>= 1.3.0, < 2.0)
25+
cocoapods-trunk (>= 1.3.1, < 2.0)
2626
cocoapods-try (>= 1.1.0, < 2.0)
2727
colored2 (~> 3.1)
2828
escape (~> 0.0.4)
29-
fourflusher (~> 2.0.1)
29+
fourflusher (>= 2.2.0, < 3.0)
3030
gh_inspector (~> 1.0)
31-
molinillo (~> 0.6.5)
31+
molinillo (~> 0.6.6)
3232
nap (~> 1.0)
33-
ruby-macho (~> 1.1)
34-
xcodeproj (>= 1.5.7, < 2.0)
35-
cocoapods-core (1.5.3)
33+
ruby-macho (~> 1.4)
34+
xcodeproj (>= 1.8.2, < 2.0)
35+
cocoapods-core (1.7.1)
3636
activesupport (>= 4.0.2, < 6)
3737
fuzzy_match (~> 2.0.4)
3838
nap (~> 1.0)
39-
cocoapods-deintegrate (1.0.2)
39+
cocoapods-deintegrate (1.0.4)
4040
cocoapods-downloader (1.2.2)
4141
cocoapods-plugins (1.0.0)
4242
nap
@@ -51,7 +51,7 @@ GEM
5151
colorize (0.8.1)
5252
commander-fastlane (4.4.6)
5353
highline (~> 1.7.2)
54-
concurrent-ruby (1.1.4)
54+
concurrent-ruby (1.1.5)
5555
declarative (0.0.10)
5656
declarative-option (0.1.0)
5757
digest-crc (0.4.1)
@@ -106,8 +106,7 @@ GEM
106106
xcodeproj (>= 1.6.0, < 2.0.0)
107107
xcpretty (~> 0.3.0)
108108
xcpretty-travis-formatter (>= 0.0.3)
109-
ffi (1.10.0)
110-
fourflusher (2.0.1)
109+
fourflusher (2.3.0)
111110
fuzzy_match (2.0.4)
112111
gh_inspector (1.1.3)
113112
google-api-client (0.23.9)
@@ -140,18 +139,8 @@ GEM
140139
httpclient (2.8.3)
141140
i18n (0.9.5)
142141
concurrent-ruby (~> 1.0)
143-
jazzy (0.9.5)
144-
cocoapods (~> 1.5.3)
145-
mustache (~> 1.1.0)
146-
open4
147-
redcarpet (~> 3.4.0)
148-
rouge (>= 2.0.6, < 4.0)
149-
sass (~> 3.6.0)
150-
sqlite3 (~> 1.3.13)
151-
xcinvoke (~> 0.3.0)
152142
json (2.1.0)
153143
jwt (2.1.0)
154-
liferaft (0.0.6)
155144
memoist (0.16.0)
156145
mime-types (3.2.2)
157146
mime-types-data (~> 3.2015)
@@ -162,32 +151,21 @@ GEM
162151
multi_json (1.13.1)
163152
multi_xml (0.6.0)
164153
multipart-post (2.0.0)
165-
mustache (1.1.0)
166154
nanaimo (0.2.6)
167155
nap (1.1.0)
168156
naturally (2.2.0)
169157
netrc (0.11.0)
170-
open4 (1.3.4)
171158
os (1.0.0)
172159
plist (3.5.0)
173160
public_suffix (2.0.5)
174-
rb-fsevent (0.10.3)
175-
rb-inotify (0.10.0)
176-
ffi (~> 1.0)
177-
redcarpet (3.4.0)
178161
representable (3.0.4)
179162
declarative (< 0.1.0)
180163
declarative-option (< 0.2.0)
181164
uber (< 0.2.0)
182165
retriable (3.1.2)
183166
rouge (2.0.7)
184-
ruby-macho (1.3.1)
167+
ruby-macho (1.4.0)
185168
rubyzip (1.2.2)
186-
sass (3.6.0)
187-
sass-listen (~> 4.0.0)
188-
sass-listen (4.0.0)
189-
rb-fsevent (~> 0.9, >= 0.9.4)
190-
rb-inotify (~> 0.9, >= 0.9.7)
191169
security (0.1.3)
192170
signet (0.11.0)
193171
addressable (~> 2.3)
@@ -198,7 +176,6 @@ GEM
198176
CFPropertyList
199177
naturally
200178
slack-notifier (2.3.2)
201-
sqlite3 (1.3.13)
202179
synx (0.2.1)
203180
clamp (~> 0.6)
204181
colorize (~> 0.7)
@@ -219,9 +196,7 @@ GEM
219196
unf_ext (0.0.7.5)
220197
unicode-display_width (1.4.1)
221198
word_wrap (1.0.0)
222-
xcinvoke (0.3.0)
223-
liferaft (~> 0.0.6)
224-
xcodeproj (1.8.0)
199+
xcodeproj (1.9.0)
225200
CFPropertyList (>= 2.3.3, < 4.0)
226201
atomos (~> 0.1.3)
227202
claide (>= 1.0.2, < 2.0)
@@ -236,9 +211,8 @@ PLATFORMS
236211
ruby
237212

238213
DEPENDENCIES
239-
cocoapods (~> 1.5.0)
214+
cocoapods (~> 1.7)
240215
fastlane
241-
jazzy
242216
synx
243217

244218
BUNDLED WITH

Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ EXTERNAL SOURCES:
2424
:path: "./"
2525

2626
SPEC CHECKSUMS:
27-
FlexLayout: 267413996e8ccc216711bcc961aa793b491ccf1e
27+
FlexLayout: 6e25c1c4aa373629458b4639f1359f46c4160e28
2828
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
2929
PinLayout: a0722a5c8f0e0168a9c091ffe4930dabf0c8582c
3030
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
3131
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
3232

3333
PODFILE CHECKSUM: 9c74b444ce1d9b0b90a0d90a353efb1f26fd93e2
3434

35-
COCOAPODS: 1.5.3
35+
COCOAPODS: 1.7.1

0 commit comments

Comments
 (0)