Skip to content

Commit 69be65a

Browse files
authored
Merge pull request #100 from serenity-kit/upgrade-to-react-native-83
Upgrade to react native 83
2 parents 1c23df7 + 17bfef4 commit 69be65a

File tree

23 files changed

+2212
-1429
lines changed

23 files changed

+2212
-1429
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
- name: Setup Node.js
1212
uses: actions/setup-node@v6
1313
with:
14-
node-version: 20.19.0
14+
node-version: 20.20.0
1515

1616
- name: Cache dependencies
1717
id: yarn-cache

.github/workflows/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Setup Node.js
1212
uses: actions/setup-node@v6
1313
with:
14-
node-version: 20.19.0
14+
node-version: 20.20.0
1515
# Unpack Libsodium
1616
- name: Unpack Libsodium
1717
run: yarn postinstall

.github/workflows/build-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup Node.js
1515
uses: actions/setup-node@v6
1616
with:
17-
node-version: 20.19.0
17+
node-version: 20.20.0
1818
# Unpack Libsodium
1919
- name: Unpack Libsodium
2020
run: yarn postinstall

.github/workflows/e2e-android.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ jobs:
1212
- name: Setup Node.js
1313
uses: actions/setup-node@v6
1414
with:
15-
node-version: 20.19.0
15+
node-version: 20.20.0
16+
- name: Setup Java 17
17+
uses: actions/setup-java@v5
18+
with:
19+
distribution: "zulu"
20+
java-version: "17"
1621
# build app
1722
- name: Get yarn cache directory path
1823
id: yarn-cache-dir-path

.github/workflows/e2e-ios.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup Node.js
1313
uses: actions/setup-node@v6
1414
with:
15-
node-version: 20.19.0
15+
node-version: 20.20.0
1616
# build App
1717
- name: Get yarn cache directory path
1818
id: yarn-cache-dir-path
@@ -30,8 +30,28 @@ jobs:
3030
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
3131
restore-keys: |
3232
${{ runner.os }}-pods-
33-
- name: Install node_modules
34-
run: yarn
33+
- name: Setup Ruby (bundle)
34+
uses: ruby/setup-ruby@v1
35+
with:
36+
ruby-version: 3.2
37+
bundler-cache: true
38+
working-directory: example/ios
39+
- name: Install node_modules in root
40+
run: yarn install --frozen-lockfile
41+
- name: Install node_modules in example
42+
run: yarn install --frozen-lockfile --cwd example
43+
- name: Fix for ruby
44+
working-directory: example/ios
45+
run: |
46+
bundle config --local build.ffi --with-cflags=-Wno-error=implicit-function-declaration
47+
bundle install
48+
- name: Clean stale podspecs
49+
working-directory: example/ios
50+
run: |
51+
rm -rf Pods/Local\ Podspecs Pods/Manifest.lock
52+
- name: Install Pods
53+
working-directory: example/ios
54+
run: bundle exec pod install --no-repo-update
3555
- name: Build iOS App
3656
working-directory: example
3757
# run: yarn run react-native run-ios --configuration Release --simulator "iPhone 13 (15.2)"

.github/workflows/e2e-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v6
1111
- uses: actions/setup-node@v6
1212
with:
13-
node-version: 20.19.0
13+
node-version: 20.20.0
1414
- name: Install node_modules
1515
run: yarn install --frozen-lockfile
1616
- name: Install node_modules for example/

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,12 @@ android.iml
4646
# Cocoapods
4747
#
4848
example/ios/Pods
49+
example/ios/.xcode.env.local
4950

5051
# Ruby
5152
example/vendor/
53+
.gems/
54+
cocoapods-1.16.2.gem
5255

5356
# node.js
5457
#
@@ -75,4 +78,4 @@ lib/
7578

7679
/test-results/
7780
/playwright-report/
78-
/playwright/.cache/
81+
/playwright/.cache/

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20.20.0

example/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20.20.0

example/Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
source 'https://rubygems.org'
22

3-
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby '>= 2.6.10'
5-
63
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
74
gem 'cocoapods', '1.16.2'
85
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
@@ -14,3 +11,4 @@ gem 'bigdecimal'
1411
gem 'logger'
1512
gem 'benchmark'
1613
gem 'mutex_m'
14+
gem 'nkf'

0 commit comments

Comments
 (0)