Skip to content

Commit e08689c

Browse files
mccarronmccarron
committed
Update Fastlane and Screenshots
1 parent a2d1a15 commit e08689c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+692
-394
lines changed

‎FiveCalls/FiveCalls.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@
799799
);
800800
name = "Generate R.Swift Code";
801801
outputPaths = (
802-
$SRCROOT/R.generated.swift,
802+
"$SRCROOT/R.generated.swift",
803803
);
804804
runOnlyForDeploymentPostprocessing = 0;
805805
shellPath = /bin/sh;

‎FiveCalls/FiveCalls.xcodeproj/xcshareddata/xcschemes/FiveCallsUITests.xcscheme‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "B5A70A571E4C01A00031DF58"
36+
BuildableName = "FiveCallsUITests.xctest"
37+
BlueprintName = "FiveCallsUITests"
38+
ReferencedContainer = "container:FiveCalls.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
3141
</Testables>
3242
<MacroExpansion>
3343
<BuildableReference

‎FiveCalls/Podfile.lock‎

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

9494
PODFILE CHECKSUM: 71a2798dd2675db554e74098deca67f9a2e5d018
9595

96-
COCOAPODS: 1.6.1
96+
COCOAPODS: 1.6.2

‎FiveCalls/Pods/Manifest.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FiveCalls/Pods/Pods.xcodeproj/project.pbxproj‎

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

‎Gemfile.lock‎

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.0)
5-
activesupport (4.2.10)
5+
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
addressable (2.5.2)
10+
addressable (2.6.0)
1111
public_suffix (>= 2.0.2, < 4.0)
12-
atomos (0.1.2)
12+
atomos (0.1.3)
1313
babosa (1.0.2)
14-
badge (0.8.5)
14+
badge (0.10.0)
1515
curb (~> 0.9)
1616
fastimage (>= 1.6)
1717
fastlane (>= 2.0)
@@ -36,19 +36,19 @@ GEM
3636
nap (~> 1.0)
3737
ruby-macho (~> 1.1)
3838
xcodeproj (>= 1.5.7, < 2.0)
39-
cocoapods-acknowledgements (1.1.2)
39+
cocoapods-acknowledgements (1.1.3)
4040
activesupport (>= 4.0.2, < 5)
4141
redcarpet (~> 3.3)
4242
cocoapods-core (1.5.3)
4343
activesupport (>= 4.0.2, < 6)
4444
fuzzy_match (~> 2.0.4)
4545
nap (~> 1.0)
46-
cocoapods-deintegrate (1.0.2)
47-
cocoapods-downloader (1.2.1)
46+
cocoapods-deintegrate (1.0.4)
47+
cocoapods-downloader (1.2.2)
4848
cocoapods-plugins (1.0.0)
4949
nap
5050
cocoapods-search (1.0.0)
51-
cocoapods-stats (1.0.0)
51+
cocoapods-stats (1.1.0)
5252
cocoapods-trunk (1.3.1)
5353
nap (>= 0.8, < 2.0)
5454
netrc (~> 0.11)
@@ -57,149 +57,156 @@ GEM
5757
colored2 (3.1.2)
5858
commander-fastlane (4.4.6)
5959
highline (~> 1.7.2)
60-
concurrent-ruby (1.0.5)
61-
curb (0.9.4)
60+
concurrent-ruby (1.1.5)
61+
curb (0.9.10)
6262
declarative (0.0.10)
6363
declarative-option (0.1.0)
64+
digest-crc (0.4.1)
6465
domain_name (0.5.20180417)
6566
unf (>= 0.0.5, < 1.0.0)
66-
dotenv (2.4.0)
67-
emoji_regex (0.1.1)
67+
dotenv (2.7.2)
68+
emoji_regex (1.0.1)
6869
escape (0.0.4)
69-
excon (0.62.0)
70-
faraday (0.15.2)
70+
excon (0.64.0)
71+
faraday (0.15.4)
7172
multipart-post (>= 1.2, < 3)
7273
faraday-cookie_jar (0.0.6)
7374
faraday (>= 0.7.4)
7475
http-cookie (~> 1.0.0)
75-
faraday_middleware (0.12.2)
76+
faraday_middleware (0.13.1)
7677
faraday (>= 0.7.4, < 1.0)
77-
fastimage (2.1.3)
78-
fastlane (2.96.1)
78+
fastimage (2.1.5)
79+
fastlane (2.125.2)
7980
CFPropertyList (>= 2.3, < 4.0.0)
8081
addressable (>= 2.3, < 3.0.0)
8182
babosa (>= 1.0.2, < 2.0.0)
82-
bundler (>= 1.12.0, < 2.0.0)
83+
bundler (>= 1.12.0, < 3.0.0)
8384
colored
8485
commander-fastlane (>= 4.4.6, < 5.0.0)
8586
dotenv (>= 2.1.1, < 3.0.0)
86-
emoji_regex (~> 0.1)
87+
emoji_regex (>= 0.1, < 2.0)
8788
excon (>= 0.45.0, < 1.0.0)
8889
faraday (~> 0.9)
8990
faraday-cookie_jar (~> 0.0.6)
9091
faraday_middleware (~> 0.9)
9192
fastimage (>= 2.1.0, < 3.0.0)
9293
gh_inspector (>= 1.1.2, < 2.0.0)
93-
google-api-client (>= 0.21.2, < 0.22.0)
94+
google-api-client (>= 0.21.2, < 0.24.0)
95+
google-cloud-storage (>= 1.15.0, < 2.0.0)
9496
highline (>= 1.7.2, < 2.0.0)
9597
json (< 3.0.0)
98+
jwt (~> 2.1.0)
9699
mini_magick (~> 4.5.1)
97-
multi_json
98100
multi_xml (~> 0.5)
99101
multipart-post (~> 2.0.0)
100102
plist (>= 3.1.0, < 4.0.0)
101103
public_suffix (~> 2.0.0)
102-
rubyzip (>= 1.1.0, < 2.0.0)
104+
rubyzip (>= 1.2.2, < 2.0.0)
103105
security (= 0.1.3)
104106
simctl (~> 1.6.3)
105107
slack-notifier (>= 2.0.0, < 3.0.0)
106-
terminal-notifier (>= 1.6.2, < 2.0.0)
108+
terminal-notifier (>= 2.0.0, < 3.0.0)
107109
terminal-table (>= 1.4.5, < 2.0.0)
108110
tty-screen (>= 0.6.3, < 1.0.0)
109111
tty-spinner (>= 0.8.0, < 1.0.0)
110112
word_wrap (~> 1.0.0)
111-
xcodeproj (>= 1.5.7, < 2.0.0)
112-
xcpretty (>= 0.2.4, < 1.0.0)
113+
xcodeproj (>= 1.8.1, < 2.0.0)
114+
xcpretty (~> 0.3.0)
113115
xcpretty-travis-formatter (>= 0.0.3)
114116
fourflusher (2.0.1)
115117
fuzzy_match (2.0.4)
116118
gh_inspector (1.1.3)
117-
google-api-client (0.21.2)
119+
google-api-client (0.23.9)
118120
addressable (~> 2.5, >= 2.5.1)
119121
googleauth (>= 0.5, < 0.7.0)
120122
httpclient (>= 2.8.1, < 3.0)
121123
mime-types (~> 3.0)
122124
representable (~> 3.0)
123125
retriable (>= 2.0, < 4.0)
124-
googleauth (0.6.2)
126+
signet (~> 0.9)
127+
google-cloud-core (1.3.0)
128+
google-cloud-env (~> 1.0)
129+
google-cloud-env (1.1.0)
130+
faraday (~> 0.11)
131+
google-cloud-storage (1.16.0)
132+
digest-crc (~> 0.4)
133+
google-api-client (~> 0.23)
134+
google-cloud-core (~> 1.2)
135+
googleauth (>= 0.6.2, < 0.10.0)
136+
googleauth (0.6.7)
125137
faraday (~> 0.12)
126138
jwt (>= 1.4, < 3.0)
127-
logging (~> 2.0)
128-
memoist (~> 0.12)
139+
memoist (~> 0.16)
129140
multi_json (~> 1.11)
130-
os (~> 0.9)
141+
os (>= 0.9, < 2.0)
131142
signet (~> 0.7)
132143
highline (1.7.10)
133144
http-cookie (1.0.3)
134145
domain_name (~> 0.5)
135146
httpclient (2.8.3)
136147
i18n (0.9.5)
137148
concurrent-ruby (~> 1.0)
138-
json (2.1.0)
149+
json (2.2.0)
139150
jwt (2.1.0)
140-
little-plugger (1.1.4)
141-
logging (2.2.2)
142-
little-plugger (~> 1.1)
143-
multi_json (~> 1.10)
144151
memoist (0.16.0)
145-
mime-types (3.1)
152+
mime-types (3.2.2)
146153
mime-types-data (~> 3.2015)
147-
mime-types-data (3.2016.0521)
154+
mime-types-data (3.2019.0331)
148155
mini_magick (4.5.1)
149156
minitest (5.11.3)
150157
molinillo (0.6.6)
151158
multi_json (1.13.1)
152159
multi_xml (0.6.0)
153160
multipart-post (2.0.0)
154-
nanaimo (0.2.5)
161+
nanaimo (0.2.6)
155162
nap (1.1.0)
156163
naturally (2.2.0)
157164
netrc (0.11.0)
158-
os (0.9.6)
159-
plist (3.4.0)
165+
os (1.0.1)
166+
plist (3.5.0)
160167
public_suffix (2.0.5)
161168
redcarpet (3.4.0)
162169
representable (3.0.4)
163170
declarative (< 0.1.0)
164171
declarative-option (< 0.2.0)
165172
uber (< 0.2.0)
166-
retriable (3.1.1)
173+
retriable (3.1.2)
167174
rouge (2.0.7)
168-
ruby-macho (1.3.1)
169-
rubyzip (1.2.2)
175+
ruby-macho (1.4.0)
176+
rubyzip (1.2.3)
170177
security (0.1.3)
171-
signet (0.8.1)
178+
signet (0.11.0)
172179
addressable (~> 2.3)
173180
faraday (~> 0.9)
174181
jwt (>= 1.5, < 3.0)
175182
multi_json (~> 1.10)
176-
simctl (1.6.4)
183+
simctl (1.6.5)
177184
CFPropertyList
178185
naturally
179186
slack-notifier (2.3.2)
180-
terminal-notifier (1.8.0)
187+
terminal-notifier (2.0.0)
181188
terminal-table (1.8.0)
182189
unicode-display_width (~> 1.1, >= 1.1.1)
183190
thread_safe (0.3.6)
184-
tty-cursor (0.5.0)
185-
tty-screen (0.6.4)
186-
tty-spinner (0.8.0)
187-
tty-cursor (>= 0.5.0)
191+
tty-cursor (0.7.0)
192+
tty-screen (0.7.0)
193+
tty-spinner (0.9.1)
194+
tty-cursor (~> 0.7)
188195
tzinfo (1.2.5)
189196
thread_safe (~> 0.1)
190197
uber (0.1.0)
191198
unf (0.1.4)
192199
unf_ext
193-
unf_ext (0.0.7.5)
194-
unicode-display_width (1.3.3)
200+
unf_ext (0.0.7.6)
201+
unicode-display_width (1.6.0)
195202
word_wrap (1.0.0)
196-
xcodeproj (1.5.9)
203+
xcodeproj (1.9.0)
197204
CFPropertyList (>= 2.3.3, < 4.0)
198-
atomos (~> 0.1.2)
205+
atomos (~> 0.1.3)
199206
claide (>= 1.0.2, < 2.0)
200207
colored2 (~> 3.1)
201-
nanaimo (~> 0.2.5)
202-
xcpretty (0.2.8)
208+
nanaimo (~> 0.2.6)
209+
xcpretty (0.3.0)
203210
rouge (~> 2.0.7)
204211
xcpretty-travis-formatter (1.0.0)
205212
xcpretty (~> 0.2, >= 0.0.7)
@@ -215,4 +222,4 @@ DEPENDENCIES
215222
fastlane
216223

217224
BUNDLED WITH
218-
1.16.3
225+
1.17.3

‎Gemfile.save‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# frozen_string_literal: true
2+
source "https://rubygems.org"
3+
4+
gem "cocoapods", "1.5.3"
5+
gem "cocoapods-acknowledgements"
6+
gem "dotenv"
7+
gem "fastlane"
8+
gem "badge"
9+
10+
11+
12+
gem 'fastlane'
13+
#gem 'fastlane', :github => 'fastlane/fastlane', :branch => 'master'
14+
15+
gem 'cocoapods', '~> 1.6.0'
16+
17+
gem 'cocoapods-fix-react-native'
18+
#gem 'cocoapods-fix-react-native', :github => 'MaximusMcCann/cocoapods-fix-react-native', :branch => 'master'
19+
#gem 'cocoapods-fix-react-native', path: '../../FORK/cocoapods-fix-react-native'
20+
21+
gem 'rest-client'
22+
#gem 'rmagick' #ImageMagick
23+
#gem 'ghostscript'
24+
25+
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
26+
eval(File.read(plugins_path), binding) if File.exist?(plugins_path)
27+
28+
29+
30+

‎fastlane/Appfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ require 'dotenv'
33
env_path = File.expand_path('../../.env', __FILE__)
44
if File.exists?(env_path)
55
Dotenv.load(env_path)
6-
else if !is_ci
7-
puts "ENV PATH: #{env_path}"
8-
puts "This project uses Dotenv to manage secret environment variables. Add these to your .env file."
9-
exit 1
6+
else
7+
if !is_ci
8+
puts "ENV PATH: #{env_path}"
9+
puts "This project uses Dotenv to manage secret environment variables. Add these to your .env file."
10+
exit 1
11+
end
1012
end
1113

1214
app_identifier "org.fivecalls.FiveCalls-ios" # The bundle identifier of your app

‎fastlane/Fastfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# All available actions: https://docs.fastlane.tools/actions
55
# can also be listed using the `fastlane actions` command
66

7-
fastlane_version "2.14.2"
7+
update_fastlane
88

99
default_platform :ios
1010

‎fastlane/Snapfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ devices([
33
"iPhone 7 Plus",
44
"iPhone SE",
55
"iPad Pro (12.9-inch)",
6-
"iPhone X"
6+
"iPad Pro (12.9-inch)",
7+
"iPhone X",
8+
"iPhone Xs Max",
9+
"iPad Pro (12.9-inch) (3rd generation)"
710
])
811

912
languages([

0 commit comments

Comments
 (0)