Skip to content
This repository was archived by the owner on Jun 2, 2019. It is now read-only.

Commit 1d6d065

Browse files
ShivaHuangvikmeup
authored andcommitted
Feature/update project configuration (#890)
* Modify: Makefile to Use Bundler Force Makefile commands use bundler to keep consistent environment. * Update: Gems
1 parent ee40dac commit 1d6d065

File tree

2 files changed

+49
-44
lines changed

2 files changed

+49
-44
lines changed

Gemfile.lock

+32-37
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ GEM
1616
cork
1717
nap
1818
open4 (~> 1.3)
19-
cocoapods (1.5.0)
19+
cocoapods (1.5.3)
2020
activesupport (>= 4.0.2, < 5)
2121
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.5.0)
22+
cocoapods-core (= 1.5.3)
2323
cocoapods-deintegrate (>= 1.0.2, < 2.0)
2424
cocoapods-downloader (>= 1.2.0, < 2.0)
2525
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -35,12 +35,12 @@ GEM
3535
nap (~> 1.0)
3636
ruby-macho (~> 1.1)
3737
xcodeproj (>= 1.5.7, < 2.0)
38-
cocoapods-core (1.5.0)
38+
cocoapods-core (1.5.3)
3939
activesupport (>= 4.0.2, < 6)
4040
fuzzy_match (~> 2.0.4)
4141
nap (~> 1.0)
4242
cocoapods-deintegrate (1.0.2)
43-
cocoapods-downloader (1.2.0)
43+
cocoapods-downloader (1.2.1)
4444
cocoapods-plugins (1.0.0)
4545
nap
4646
cocoapods-search (1.0.0)
@@ -56,7 +56,7 @@ GEM
5656
concurrent-ruby (1.0.5)
5757
cork (0.3.0)
5858
colored2 (~> 3.1)
59-
danger (5.5.11)
59+
danger (5.6.4)
6060
claide (~> 1.0)
6161
claide-plugins (>= 0.9.2)
6262
colored2 (~> 3.1)
@@ -68,19 +68,19 @@ GEM
6868
no_proxy_fix
6969
octokit (~> 4.7)
7070
terminal-table (~> 1)
71-
danger-swiftlint (0.16.0)
71+
danger-swiftlint (0.17.3)
7272
danger
7373
rake (> 10)
7474
thor (~> 0.19)
7575
declarative (0.0.10)
7676
declarative-option (0.1.0)
77-
domain_name (0.5.20170404)
77+
domain_name (0.5.20180417)
7878
unf (>= 0.0.5, < 1.0.0)
79-
dotenv (2.2.2)
79+
dotenv (2.5.0)
8080
emoji_regex (0.1.1)
8181
escape (0.0.4)
8282
excon (0.62.0)
83-
faraday (0.14.0)
83+
faraday (0.15.2)
8484
multipart-post (>= 1.2, < 3)
8585
faraday-cookie_jar (0.0.6)
8686
faraday (>= 0.7.4)
@@ -89,8 +89,8 @@ GEM
8989
faraday (~> 0.8)
9090
faraday_middleware (0.12.2)
9191
faraday (>= 0.7.4, < 1.0)
92-
fastimage (2.1.1)
93-
fastlane (2.91.0)
92+
fastimage (2.1.3)
93+
fastlane (2.101.1)
9494
CFPropertyList (>= 2.3, < 4.0.0)
9595
addressable (>= 2.3, < 3.0.0)
9696
babosa (>= 1.0.2, < 2.0.0)
@@ -105,7 +105,7 @@ GEM
105105
faraday_middleware (~> 0.9)
106106
fastimage (>= 2.1.0, < 3.0.0)
107107
gh_inspector (>= 1.1.2, < 2.0.0)
108-
google-api-client (>= 0.13.1, < 0.14.0)
108+
google-api-client (>= 0.21.2, < 0.24.0)
109109
highline (>= 1.7.2, < 2.0.0)
110110
json (< 3.0.0)
111111
mini_magick (~> 4.5.1)
@@ -114,7 +114,7 @@ GEM
114114
multipart-post (~> 2.0.0)
115115
plist (>= 3.1.0, < 4.0.0)
116116
public_suffix (~> 2.0.0)
117-
rubyzip (>= 1.1.0, < 2.0.0)
117+
rubyzip (>= 1.2.1, < 2.0.0)
118118
security (= 0.1.3)
119119
simctl (~> 1.6.3)
120120
slack-notifier (>= 2.0.0, < 3.0.0)
@@ -124,26 +124,25 @@ GEM
124124
tty-spinner (>= 0.8.0, < 1.0.0)
125125
word_wrap (~> 1.0.0)
126126
xcodeproj (>= 1.5.7, < 2.0.0)
127-
xcpretty (>= 0.2.4, < 1.0.0)
127+
xcpretty (~> 0.2.8)
128128
xcpretty-travis-formatter (>= 0.0.3)
129129
fourflusher (2.0.1)
130130
fuzzy_match (2.0.4)
131131
gh_inspector (1.1.3)
132-
git (1.3.0)
133-
google-api-client (0.13.6)
132+
git (1.4.0)
133+
google-api-client (0.23.4)
134134
addressable (~> 2.5, >= 2.5.1)
135-
googleauth (~> 0.5)
135+
googleauth (>= 0.5, < 0.7.0)
136136
httpclient (>= 2.8.1, < 3.0)
137137
mime-types (~> 3.0)
138138
representable (~> 3.0)
139139
retriable (>= 2.0, < 4.0)
140-
googleauth (0.6.2)
140+
googleauth (0.6.3)
141141
faraday (~> 0.12)
142142
jwt (>= 1.4, < 3.0)
143-
logging (~> 2.0)
144143
memoist (~> 0.12)
145144
multi_json (~> 1.11)
146-
os (~> 0.9)
145+
os (>= 0.9, < 2.0)
147146
signet (~> 0.7)
148147
highline (1.7.10)
149148
http-cookie (1.0.3)
@@ -153,11 +152,7 @@ GEM
153152
concurrent-ruby (~> 1.0)
154153
json (2.1.0)
155154
jwt (2.1.0)
156-
kramdown (1.16.2)
157-
little-plugger (1.1.4)
158-
logging (2.2.2)
159-
little-plugger (~> 1.1)
160-
multi_json (~> 1.10)
155+
kramdown (1.17.0)
161156
memoist (0.16.0)
162157
mime-types (3.1)
163158
mime-types-data (~> 3.2015)
@@ -168,25 +163,25 @@ GEM
168163
multi_json (1.13.1)
169164
multi_xml (0.6.0)
170165
multipart-post (2.0.0)
171-
nanaimo (0.2.5)
166+
nanaimo (0.2.6)
172167
nap (1.1.0)
173-
naturally (2.1.0)
168+
naturally (2.2.0)
174169
netrc (0.11.0)
175170
no_proxy_fix (0.1.2)
176-
octokit (4.8.0)
171+
octokit (4.9.0)
177172
sawyer (~> 0.8.0, >= 0.5.3)
178173
open4 (1.3.4)
179-
os (0.9.6)
174+
os (1.0.0)
180175
plist (3.4.0)
181176
public_suffix (2.0.5)
182177
rake (12.3.1)
183178
representable (3.0.4)
184179
declarative (< 0.1.0)
185180
declarative-option (< 0.2.0)
186181
uber (< 0.2.0)
187-
retriable (3.1.1)
182+
retriable (3.1.2)
188183
rouge (2.0.7)
189-
ruby-macho (1.1.0)
184+
ruby-macho (1.2.0)
190185
rubyzip (1.2.1)
191186
sawyer (0.8.1)
192187
addressable (>= 2.3.5, < 2.6)
@@ -197,7 +192,7 @@ GEM
197192
faraday (~> 0.9)
198193
jwt (>= 1.5, < 3.0)
199194
multi_json (~> 1.10)
200-
simctl (1.6.3)
195+
simctl (1.6.5)
201196
CFPropertyList
202197
naturally
203198
slack-notifier (2.3.2)
@@ -206,8 +201,8 @@ GEM
206201
unicode-display_width (~> 1.1, >= 1.1.1)
207202
thor (0.20.0)
208203
thread_safe (0.3.6)
209-
tty-cursor (0.5.0)
210-
tty-screen (0.6.4)
204+
tty-cursor (0.6.0)
205+
tty-screen (0.6.5)
211206
tty-spinner (0.8.0)
212207
tty-cursor (>= 0.5.0)
213208
tzinfo (1.2.5)
@@ -216,14 +211,14 @@ GEM
216211
unf (0.1.4)
217212
unf_ext
218213
unf_ext (0.0.7.5)
219-
unicode-display_width (1.3.0)
214+
unicode-display_width (1.4.0)
220215
word_wrap (1.0.0)
221-
xcodeproj (1.5.7)
216+
xcodeproj (1.5.9)
222217
CFPropertyList (>= 2.3.3, < 4.0)
223218
atomos (~> 0.1.2)
224219
claide (>= 1.0.2, < 2.0)
225220
colored2 (~> 3.1)
226-
nanaimo (~> 0.2.4)
221+
nanaimo (~> 0.2.5)
227222
xcpretty (0.2.8)
228223
rouge (~> 2.0.7)
229224
xcpretty-travis-formatter (1.0.0)

Makefile

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
11
.DEFAULT_GOAL := bootstrap
22

3-
exists_pod = $(shell command -v pod 2> /dev/null)
3+
exists_bundler = $(shell command -v bundle 2> /dev/null)
4+
bundle_check = $(shell bundle check 1> /dev/null; echo $$?)
45

56
install_env:
67

7-
ifeq "${exists_pod}" ""
8-
sudo gem install cocoapods
8+
ifeq "${exists_bundler}" ""
9+
sudo gem install bundler
910
endif
1011

1112
@echo "All dependencies was installed"
1213

1314
install:
1415

15-
ifeq "${exists_pod}" ""
16-
@echo "Cocopods is not installed. Use `make install_env`"
16+
ifeq "${exists_bundler}" ""
17+
@echo "Bundler is not installed. Use `make install_env`"
1718
endif
1819

19-
pod install --repo-update
20+
ifneq ($(bundle_check), 0)
21+
bundle install
22+
endif
23+
24+
bundle exec pod install --repo-update
2025

2126
bootstrap: install
2227

2328
release:
24-
fastlane release
29+
30+
ifeq "${exists_bundler}" ""
31+
@echo "Bundler is not installed. Use `make install_env`"
32+
endif
33+
34+
bundle exec fastlane release

0 commit comments

Comments
 (0)