Skip to content

Commit 5810140

Browse files
chore: RN Upgrade
1 parent b9bd1d2 commit 5810140

Some content is hidden

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

57 files changed

+16338
-15181
lines changed

.github/workflows/build-android.yml

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,49 +19,8 @@ on:
1919
- 'example/yarn.lock'
2020

2121
jobs:
22-
build_example:
23-
name: Build Android Example App
24-
runs-on: ubuntu-latest
25-
steps:
26-
- uses: actions/checkout@v4
27-
- name: Install node
28-
uses: actions/setup-node@v3
29-
with:
30-
node-version: 18
31-
- name: Setup JDK 17
32-
uses: actions/setup-java@v2
33-
with:
34-
java-version: 17
35-
distribution: 'temurin'
3622

37-
- name: Get yarn cache directory path
38-
id: yarn-cache-dir-path
39-
run: echo "::set-output name=dir::$(yarn cache dir)"
40-
- name: Restore node_modules from cache
41-
uses: actions/cache@v2
42-
id: yarn-cache
43-
with:
44-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
45-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
46-
restore-keys: |
47-
${{ runner.os }}-yarn-
48-
- name: Install node_modules
49-
run: yarn install --frozen-lockfile
50-
- name: Install node_modules for example/
51-
run: yarn install --frozen-lockfile --cwd example
52-
53-
- name: Restore Gradle cache
54-
uses: actions/cache@v2
55-
with:
56-
path: |
57-
~/.gradle/caches
58-
~/.gradle/wrapper
59-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
60-
restore-keys: |
61-
${{ runner.os }}-gradle-
62-
- name: Run Gradle Build for example/android/
63-
run: cd example/android && ./gradlew assembleDebug --build-cache && cd ../..
64-
build_example_new_arch:
23+
build_example:
6524
name: Build Android Example App with new arch enabled
6625
runs-on: ubuntu-latest
6726
steps:
@@ -99,4 +58,4 @@ jobs:
9958
restore-keys: |
10059
${{ runner.os }}-gradle-
10160
- name: Run Gradle Build for example/android/
102-
run: cd example/android && ./gradlew assembleDebug -PnewArchEnabled=true --build-cache && cd ../..
61+
run: cd example/android && ./gradlew assembleDebug --build-cache && cd ../..

.github/workflows/build-ios.yml

Lines changed: 2 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Setup Ruby (bundle)
5151
uses: ruby/setup-ruby@v1
5252
with:
53-
ruby-version: 2.7
53+
ruby-version: 3.4.0
5454
bundler-cache: true
5555
working-directory: example
5656

@@ -80,63 +80,4 @@ jobs:
8080
-destination 'platform=iOS Simulator,name=iPhone 11 Pro' \
8181
build \
8282
CODE_SIGNING_ALLOWED=NO | xcpretty"
83-
build_new_arch:
84-
name: Build iOS Example App with new arch enabled
85-
runs-on: macOS-13
86-
defaults:
87-
run:
88-
working-directory: example/ios
89-
steps:
90-
- uses: actions/checkout@v4
91-
92-
- name: Get yarn cache directory path
93-
id: yarn-cache-dir-path
94-
run: echo "::set-output name=dir::$(yarn cache dir)"
95-
- name: Restore node_modules from cache
96-
uses: actions/cache@v2
97-
id: yarn-cache
98-
with:
99-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
100-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
101-
restore-keys: |
102-
${{ runner.os }}-yarn-
103-
- name: Install node_modules for example/
104-
run: yarn install --frozen-lockfile --cwd ..
105-
106-
- name: Restore buildcache
107-
uses: mikehardy/buildcache-action@v1
108-
continue-on-error: true
109-
110-
- name: Setup Ruby (bundle)
111-
uses: ruby/setup-ruby@v1
112-
with:
113-
ruby-version: 2.7
114-
bundler-cache: true
115-
working-directory: example
116-
117-
- name: Restore Pods cache
118-
uses: actions/cache@v2
119-
with:
120-
path: |
121-
example/ios/Pods
122-
~/Library/Caches/CocoaPods
123-
~/.cocoapods
124-
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
125-
restore-keys: |
126-
${{ runner.os }}-pods-
127-
- name: Install Pods
128-
run: RCT_NEW_ARCH_ENABLED=1 pod install
129-
- name: Install xcpretty
130-
run: gem install xcpretty
131-
- name: Build App
132-
run: "set -o pipefail && xcodebuild \
133-
CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
134-
-derivedDataPath build -UseModernBuildSystem=YES \
135-
-workspace example.xcworkspace \
136-
ONLY_ACTIVE_ARCH=NO \
137-
-scheme example \
138-
-sdk iphonesimulator \
139-
-configuration Debug \
140-
-destination 'platform=iOS Simulator,name=iPhone 11 Pro' \
141-
build \
142-
CODE_SIGNING_ALLOWED=NO | xcpretty"
83+

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ DerivedData
2727
*.ipa
2828
*.xcuserstate
2929
project.xcworkspace
30+
.cxx/
3031

3132
# Android/IntelliJ
3233
#
@@ -43,3 +44,9 @@ buck-out/
4344

4445
# generated by bob
4546
lib/
47+
48+
# cocoapods
49+
Pods/
50+
Podfile.lock
51+
Podfile.lock.lock
52+
bundle/

.yarn/install-state.gz

1.29 MB
Binary file not shown.

.yarnrc.yml

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

app.txt

Whitespace-only changes.

example/.gitignore

Lines changed: 0 additions & 66 deletions
This file was deleted.

example/.prettierrc.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

example/Gemfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,14 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.13'
7-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'
11+
12+
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'bigdecimal'
14+
gem 'logger'
15+
gem 'benchmark'
16+
gem 'mutex_m'

example/Gemfile.lock

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
5-
rexml
6-
activesupport (7.0.8)
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
CFPropertyList (3.0.8)
5+
activesupport (7.2.3)
6+
base64
7+
benchmark (>= 0.3)
8+
bigdecimal
9+
concurrent-ruby (~> 1.0, >= 1.3.1)
10+
connection_pool (>= 2.2.5)
11+
drb
812
i18n (>= 1.6, < 2)
13+
logger (>= 1.4.2)
914
minitest (>= 5.1)
10-
tzinfo (~> 2.0)
11-
addressable (2.8.6)
12-
public_suffix (>= 2.0.2, < 6.0)
15+
securerandom (>= 0.3)
16+
tzinfo (~> 2.0, >= 2.0.5)
17+
addressable (2.8.8)
18+
public_suffix (>= 2.0.2, < 8.0)
1319
algoliasearch (1.27.5)
1420
httpclient (~> 2.8, >= 2.8.3)
1521
json (>= 1.5.1)
1622
atomos (0.1.3)
23+
base64 (0.3.0)
24+
benchmark (0.5.0)
25+
bigdecimal (3.3.1)
1726
claide (1.1.0)
18-
cocoapods (1.14.3)
27+
cocoapods (1.15.2)
1928
addressable (~> 2.8)
2029
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.14.3)
30+
cocoapods-core (= 1.15.2)
2231
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2332
cocoapods-downloader (>= 2.1, < 3.0)
2433
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -33,7 +42,7 @@ GEM
3342
nap (~> 1.0)
3443
ruby-macho (>= 2.3.0, < 3.0)
3544
xcodeproj (>= 1.23.0, < 2.0)
36-
cocoapods-core (1.14.3)
45+
cocoapods-core (1.15.2)
3746
activesupport (>= 5.0, < 8)
3847
addressable (~> 2.8)
3948
algoliasearch (~> 1.0)
@@ -53,47 +62,59 @@ GEM
5362
netrc (~> 0.11)
5463
cocoapods-try (1.2.0)
5564
colored2 (3.1.2)
56-
concurrent-ruby (1.2.3)
65+
concurrent-ruby (1.3.3)
66+
connection_pool (3.0.2)
67+
drb (2.2.3)
5768
escape (0.0.4)
58-
ethon (0.16.0)
69+
ethon (0.15.0)
5970
ffi (>= 1.15.0)
60-
ffi (1.16.3)
71+
ffi (1.17.2)
6172
fourflusher (2.3.1)
6273
fuzzy_match (2.0.4)
6374
gh_inspector (1.1.3)
64-
httpclient (2.8.3)
65-
i18n (1.14.1)
75+
httpclient (2.9.0)
76+
mutex_m
77+
i18n (1.14.7)
6678
concurrent-ruby (~> 1.0)
67-
json (2.7.1)
68-
minitest (5.21.2)
79+
json (2.18.0)
80+
logger (1.7.0)
81+
minitest (5.27.0)
6982
molinillo (0.8.0)
83+
mutex_m (0.3.0)
7084
nanaimo (0.3.0)
7185
nap (1.1.0)
7286
netrc (0.11.0)
7387
public_suffix (4.0.7)
74-
rexml (3.2.6)
88+
rexml (3.4.4)
7589
ruby-macho (2.5.1)
76-
typhoeus (1.4.1)
77-
ethon (>= 0.9.0)
90+
securerandom (0.4.1)
91+
typhoeus (1.5.0)
92+
ethon (>= 0.9.0, < 0.16.0)
7893
tzinfo (2.0.6)
7994
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.23.0)
95+
xcodeproj (1.25.1)
8196
CFPropertyList (>= 2.3.3, < 4.0)
8297
atomos (~> 0.1.3)
8398
claide (>= 1.0.2, < 2.0)
8499
colored2 (~> 3.1)
85100
nanaimo (~> 0.3.0)
86-
rexml (~> 3.2.4)
101+
rexml (>= 3.3.6, < 4.0)
87102

88103
PLATFORMS
89104
ruby
90105

91106
DEPENDENCIES
92-
activesupport (>= 6.1.7.3, < 7.1.0)
93-
cocoapods (~> 1.13)
107+
activesupport (>= 6.1.7.5, != 7.1.0)
108+
benchmark
109+
bigdecimal
110+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
111+
concurrent-ruby (< 1.3.4)
112+
logger
113+
mutex_m
114+
xcodeproj (< 1.26.0)
94115

95116
RUBY VERSION
96-
ruby 2.7.4p191
117+
ruby 3.2.0p0
97118

98119
BUNDLED WITH
99-
2.2.33
120+
2.6.9

0 commit comments

Comments
 (0)