Skip to content

Commit 872cca5

Browse files
committed
Merge branch 'master' into drew/stub-android-platform-color
2 parents e43d876 + 11805a1 commit 872cca5

File tree

10 files changed

+483
-807
lines changed

10 files changed

+483
-807
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
ruby-version: '2.6'
4444
bundler-cache: true
4545
- name: Restore Gradle cache
46-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
46+
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
4747
with:
4848
path: |
4949
~/.gradle/caches

.github/workflows/cache-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out code
15-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
15+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
1616

1717
- name: Cleanup
1818
run: |

.github/workflows/check.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Extract job definition
2828
run: yq '.jobs.${{ github.job }}' .github/workflows/check.yml > .github/job.yml
2929

30-
- uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
30+
- uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
3131
id: node-cache
3232
with:
3333
path: node_modules/
@@ -42,7 +42,7 @@ jobs:
4242
- if: steps.node-cache.outputs.cache-hit != 'true'
4343
run: npm ci
4444

45-
- uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
45+
- uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
4646
if: steps.node-cache.outputs.cache-hit != 'true'
4747
with:
4848
path: node_modules/
@@ -59,7 +59,7 @@ jobs:
5959
- name: Extract job definition
6060
run: yq '.jobs.${{ github.job }}' .github/workflows/check.yml > .github/job.yml
6161

62-
- uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
62+
- uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
6363
id: node-cache
6464
with:
6565
path: node_modules/
@@ -74,7 +74,7 @@ jobs:
7474
- if: steps.node-cache.outputs.cache-hit != 'true'
7575
run: npm ci
7676

77-
- uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
77+
- uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
7878
if: steps.node-cache.outputs.cache-hit != 'true'
7979
with:
8080
path: node_modules/
@@ -106,7 +106,7 @@ jobs:
106106
run: yq '.jobs.${{ github.job }}' .github/workflows/check.yml > .github/job.yml
107107

108108
- name: Restore Cocoapods cache
109-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
109+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
110110
id: cocoapods-cache
111111
with:
112112
path: ios/Pods
@@ -127,7 +127,7 @@ jobs:
127127

128128
- name: Restore node_modules cache
129129
if: steps.cocoapods-cache.outputs.cache-hit != 'true'
130-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
130+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
131131
id: node-cache
132132
with:
133133
path: node_modules/
@@ -141,7 +141,7 @@ jobs:
141141
working-directory: ./ios
142142

143143
- name: Save Cocoapods cache
144-
uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
144+
uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
145145
if: steps.cocoapods-cache.outputs.cache-hit != 'true'
146146
with:
147147
path: ios/Pods
@@ -159,7 +159,7 @@ jobs:
159159
node-version-file: '.node-version'
160160

161161
- name: Restore node_modules cache
162-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
162+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
163163
id: node-cache
164164
with:
165165
path: node_modules/
@@ -182,7 +182,7 @@ jobs:
182182
node-version-file: '.node-version'
183183

184184
- name: Restore node_modules cache
185-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
185+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
186186
id: node-cache
187187
with:
188188
path: node_modules/
@@ -205,7 +205,7 @@ jobs:
205205
node-version-file: '.node-version'
206206

207207
- name: Restore node_modules cache
208-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
208+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
209209
id: node-cache
210210
with:
211211
path: node_modules/
@@ -218,7 +218,7 @@ jobs:
218218
run: npm run test -- --coverage
219219

220220
- name: Upload coverage
221-
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3
221+
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3
222222

223223
tsc:
224224
name: TypeScript
@@ -232,7 +232,7 @@ jobs:
232232
node-version-file: '.node-version'
233233

234234
- name: Restore node_modules cache
235-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
235+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
236236
id: node-cache
237237
with:
238238
path: node_modules/
@@ -255,7 +255,7 @@ jobs:
255255
node-version-file: '.node-version'
256256

257257
- name: Restore node_modules cache
258-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
258+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
259259
id: node-cache
260260
with:
261261
path: node_modules/
@@ -285,7 +285,7 @@ jobs:
285285
node-version-file: '.node-version'
286286

287287
- name: Restore node_modules cache
288-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
288+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
289289
id: node-cache
290290
with:
291291
path: node_modules/
@@ -295,7 +295,7 @@ jobs:
295295
run: exit 1
296296

297297
- name: Load the cached jsbundle
298-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
298+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
299299
id: jsbundle-cache
300300
with:
301301
path: |
@@ -311,7 +311,7 @@ jobs:
311311
APP_MODE: mocked
312312

313313
- name: Cache the jsbundle
314-
uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
314+
uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
315315
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
316316
with:
317317
path: |
@@ -337,7 +337,7 @@ jobs:
337337
node-version-file: '.node-version'
338338

339339
- name: Restore node_modules cache
340-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
340+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
341341
id: node-cache
342342
with:
343343
path: node_modules/
@@ -347,7 +347,7 @@ jobs:
347347
run: exit 1
348348

349349
- name: Load the cached jsbundle
350-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
350+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
351351
id: jsbundle-cache
352352
with:
353353
path: ./android/generated/
@@ -361,7 +361,7 @@ jobs:
361361

362362
- name: Cache the jsbundle
363363
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
364-
uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
364+
uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
365365
with:
366366
path: ./android/generated/
367367
key: ${{ steps.jsbundle-cache.outputs.cache-primary-key }}
@@ -378,7 +378,7 @@ jobs:
378378
node-version-file: '.node-version'
379379

380380
- name: Restore node_modules cache
381-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
381+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
382382
id: node-cache
383383
with:
384384
path: node_modules/
@@ -387,7 +387,7 @@ jobs:
387387
- if: steps.node-cache.outputs.cache-hit != 'true'
388388
run: exit 1
389389

390-
- uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
390+
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
391391
with:
392392
distribution: ${{ env.java_distribution }}
393393
java-version: ${{ env.java_version }}
@@ -400,7 +400,7 @@ jobs:
400400
sudo sysctl -p
401401
402402
- name: Gradle
403-
uses: gradle/gradle-build-action@6095a76664413da4c8c134ee32e8a8ae900f0f1f # v2
403+
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
404404
with:
405405
arguments: bundleRelease --scan
406406
build-root-directory: android
@@ -417,7 +417,7 @@ jobs:
417417
path: build/reports/
418418

419419
- name: Cache the Android app
420-
uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
420+
uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
421421
with:
422422
path: android/app/build/outputs/apk/
423423
key: ${{ steps.app-cache.outputs.cache-primary-key }}
@@ -443,7 +443,7 @@ jobs:
443443

444444
- name: Check for cached iOS app
445445
id: app-cache
446-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
446+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
447447
with:
448448
path: ios/build/Build/Products/
449449
key: ${{ runner.os }}-ios-xcode@${{ env.xcode_version }}-${{ hashFiles('**/project.pbxproj', '**/Podfile', '**/Podfile.lock', 'package-lock.json', '.github/job.yml') }}
@@ -455,7 +455,7 @@ jobs:
455455

456456
- name: Restore node_modules cache
457457
if: steps.app-cache.outputs.cache-hit != 'true'
458-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
458+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
459459
id: node-cache
460460
with:
461461
path: node_modules/
@@ -475,7 +475,7 @@ jobs:
475475

476476
- name: Restore Cocoapods cache
477477
if: steps.app-cache.outputs.cache-hit != 'true'
478-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
478+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
479479
id: pods-cache
480480
with:
481481
path: ios/Pods
@@ -499,7 +499,7 @@ jobs:
499499
run: npx detox build e2e --configuration ios.sim.release
500500

501501
- name: Cache the iOS app
502-
uses: actions/cache/save@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
502+
uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
503503
with:
504504
path: ios/build/Build/Products/
505505
key: ${{ steps.app-cache.outputs.cache-primary-key }}
@@ -520,7 +520,7 @@ jobs:
520520

521521
- # load the app before reinstalling detox, so that the package-lock cannot change
522522
name: Load the cached iOS app
523-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
523+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
524524
id: app-cache
525525
with:
526526
path: ios/build/Build/Products/
@@ -531,7 +531,7 @@ jobs:
531531

532532
- # load the jsbundle before reinstalling detox, so that the package-lock cannot change
533533
name: Load the cached iOS jsbundle
534-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
534+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
535535
id: jsbundle-cache
536536
with:
537537
path: |
@@ -555,7 +555,7 @@ jobs:
555555
node-version-file: '.node-version'
556556

557557
- name: Restore node_modules cache
558-
uses: actions/cache/restore@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
558+
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
559559
id: node-cache
560560
with:
561561
path: node_modules/

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: 'Checkout Repository'
15-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
15+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
1616

1717
- name: 'Dependency Review'
1818
uses: actions/dependency-review-action@f46c48ed6d4f1227fb2d9ea62bf6bcbed315589e # v3

.github/workflows/validate-gradle-wrapper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
name: "Validation"
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
16+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
1717
- uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ gem 'fastlane', '2.212.2'
44
gem 'netrc', '0.11.0'
55
gem 'json', '2.6.3'
66
gem 'xcodeproj', '1.22.0'
7-
gem 'cocoapods', '1.12.0'
7+
gem 'cocoapods', '1.12.1'
88

99
# fastlane plugins
1010

1111
group :development do
12-
gem 'rubocop', '1.45.1'
12+
gem 'rubocop', '1.52.0'
1313
end

0 commit comments

Comments
 (0)