Skip to content

Commit 24a7d1c

Browse files
authored
Support React Native 0.73 (#2671)
## Description - updates `CMakeLists.txt` so includes can be resolved - moves architecture-specific files out of `src` - at first, I thought that it would resolve the redefinition errors, but it seems like a clean build is required after changing the architecture. Anyway, since it's already there and unifies how source sets are handled I figured it may as well stay. Updates root directory and `FabricExample` to RN 0.73. I've run into an issue with babel trying to upgrade the `example` app (some `export` were not transpiled to `module.exports`) ## Test plan Tested on FabricExample app (both architectures).
1 parent 09adf84 commit 24a7d1c

File tree

62 files changed

+3128
-2114
lines changed

Some content is hidden

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

62 files changed

+3128
-2114
lines changed

.github/workflows/android-build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,15 @@ jobs:
2222
steps:
2323
- name: checkout
2424
uses: actions/checkout@v2
25-
- name: Use Node.js 16
25+
- name: Use Java 17
26+
uses: actions/setup-java@v3
27+
with:
28+
distribution: 'oracle'
29+
java-version: '17'
30+
- name: Use Node.js 18
2631
uses: actions/setup-node@v2
2732
with:
28-
node-version: 16
33+
node-version: 18
2934
cache: 'yarn'
3035
- name: Install node dependencies
3136
working-directory: ${{ matrix.working-directory }}

.github/workflows/docs-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
- name: checkout
1818
uses: actions/checkout@v2
19-
- name: Use Node.js 16
19+
- name: Use Node.js 18
2020
uses: actions/setup-node@v2
2121
with:
22-
node-version: 16
22+
node-version: 18
2323
cache: 'yarn'
2424
- name: Install node dependencies
2525
working-directory: ${{ env.WORKING_DIRECTORY }}

.github/workflows/ios-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
steps:
2323
- name: checkout
2424
uses: actions/checkout@v2
25-
- name: Use Node.js 16
25+
- name: Use Node.js 18
2626
uses: actions/setup-node@v2
2727
with:
28-
node-version: 16
28+
node-version: 18
2929
cache: 'yarn'
3030
- name: Install node dependencies
3131
working-directory: ${{ matrix.working-directory }}
@@ -35,4 +35,4 @@ jobs:
3535
run: pod install
3636
- name: Build app
3737
working-directory: ${{ matrix.working-directory }}
38-
run: yarn ios
38+
run: yarn ios --simulator=\"iPhone 11\" --mode Debug

.github/workflows/kotlin-lint.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ jobs:
1616
- name: checkout
1717
uses: actions/checkout@v2
1818

19-
- name: Use Node.js 16
19+
- name: Use Java 17
20+
uses: actions/setup-java@v3
21+
with:
22+
distribution: 'oracle'
23+
java-version: '17'
24+
25+
- name: Use Node.js 18
2026
uses: actions/setup-node@v2
2127
with:
22-
node-version: 16
28+
node-version: 18
2329
cache: 'yarn'
2430

2531
- uses: actions/cache@v2

.github/workflows/static-example-apps-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
steps:
2020
- name: checkout
2121
uses: actions/checkout@v2
22-
- name: Use Node.js 16
22+
- name: Use Node.js 18
2323
uses: actions/setup-node@v2
2424
with:
25-
node-version: 16
25+
node-version: 18
2626
cache: 'yarn'
2727
- name: Install root node dependencies
2828
run: yarn

.github/workflows/static-root-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
- name: checkout
1818
uses: actions/checkout@v2
19-
- name: Use Node.js 16
19+
- name: Use Node.js 18
2020
uses: actions/setup-node@v2
2121
with:
22-
node-version: 16
22+
node-version: 18
2323
cache: 'yarn'
2424
- name: Install node dependencies
2525
run: yarn

FabricExample/Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
5-
gem 'cocoapods', '~> 1.12'
5+
6+
gem 'cocoapods', '~> 1.13'
7+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

FabricExample/Gemfile.lock

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.6)
5+
rexml
6+
activesupport (7.0.7.2)
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
addressable (2.8.5)
12+
public_suffix (>= 2.0.2, < 6.0)
13+
algoliasearch (1.27.5)
14+
httpclient (~> 2.8, >= 2.8.3)
15+
json (>= 1.5.1)
16+
atomos (0.1.3)
17+
claide (1.1.0)
18+
cocoapods (1.14.2)
19+
addressable (~> 2.8)
20+
claide (>= 1.0.2, < 2.0)
21+
cocoapods-core (= 1.14.2)
22+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23+
cocoapods-downloader (>= 2.0)
24+
cocoapods-plugins (>= 1.0.0, < 2.0)
25+
cocoapods-search (>= 1.0.0, < 2.0)
26+
cocoapods-trunk (>= 1.6.0, < 2.0)
27+
cocoapods-try (>= 1.1.0, < 2.0)
28+
colored2 (~> 3.1)
29+
escape (~> 0.0.4)
30+
fourflusher (>= 2.3.0, < 3.0)
31+
gh_inspector (~> 1.0)
32+
molinillo (~> 0.8.0)
33+
nap (~> 1.0)
34+
ruby-macho (>= 2.3.0, < 3.0)
35+
xcodeproj (>= 1.23.0, < 2.0)
36+
cocoapods-core (1.14.2)
37+
activesupport (>= 5.0, < 8)
38+
addressable (~> 2.8)
39+
algoliasearch (~> 1.0)
40+
concurrent-ruby (~> 1.1)
41+
fuzzy_match (~> 2.0.4)
42+
nap (~> 1.0)
43+
netrc (~> 0.11)
44+
public_suffix (~> 4.0)
45+
typhoeus (~> 1.0)
46+
cocoapods-deintegrate (1.0.5)
47+
cocoapods-downloader (2.0)
48+
cocoapods-plugins (1.0.0)
49+
nap
50+
cocoapods-search (1.0.1)
51+
cocoapods-trunk (1.6.0)
52+
nap (>= 0.8, < 2.0)
53+
netrc (~> 0.11)
54+
cocoapods-try (1.2.0)
55+
colored2 (3.1.2)
56+
concurrent-ruby (1.2.2)
57+
escape (0.0.4)
58+
ethon (0.16.0)
59+
ffi (>= 1.15.0)
60+
ffi (1.16.3)
61+
fourflusher (2.3.1)
62+
fuzzy_match (2.0.4)
63+
gh_inspector (1.1.3)
64+
httpclient (2.8.3)
65+
i18n (1.14.1)
66+
concurrent-ruby (~> 1.0)
67+
json (2.6.3)
68+
minitest (5.19.0)
69+
molinillo (0.8.0)
70+
nanaimo (0.3.0)
71+
nap (1.1.0)
72+
netrc (0.11.0)
73+
public_suffix (4.0.7)
74+
rexml (3.2.6)
75+
ruby-macho (2.5.1)
76+
typhoeus (1.4.0)
77+
ethon (>= 0.9.0)
78+
tzinfo (2.0.6)
79+
concurrent-ruby (~> 1.0)
80+
xcodeproj (1.23.0)
81+
CFPropertyList (>= 2.3.3, < 4.0)
82+
atomos (~> 0.1.3)
83+
claide (>= 1.0.2, < 2.0)
84+
colored2 (~> 3.1)
85+
nanaimo (~> 0.3.0)
86+
rexml (~> 3.2.4)
87+
88+
PLATFORMS
89+
ruby
90+
91+
DEPENDENCIES
92+
activesupport (>= 6.1.7.3, < 7.1.0)
93+
cocoapods (~> 1.13)
94+
95+
RUBY VERSION
96+
ruby 2.7.5p203
97+
98+
BUNDLED WITH
99+
2.1.4

FabricExample/android/app/build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: "com.android.application"
22
apply plugin: "com.facebook.react"
3+
apply plugin: "org.jetbrains.kotlin.android"
34

45
import com.android.build.OutputFile
56

@@ -91,7 +92,8 @@ def reactNativeArchitectures() {
9192
android {
9293
ndkVersion rootProject.ext.ndkVersion
9394

94-
compileSdkVersion rootProject.ext.compileSdkVersion
95+
buildToolsVersion rootProject.ext.buildToolsVersion
96+
compileSdk rootProject.ext.compileSdkVersion
9597

9698
namespace "com.fabricexample"
9799
defaultConfig {
@@ -152,12 +154,7 @@ dependencies {
152154
// The version of react-native is set by the React Native Gradle Plugin
153155
implementation("com.facebook.react:react-android")
154156

155-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
156-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
157-
exclude group:'com.squareup.okhttp3', module:'okhttp'
158-
}
159-
160-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
157+
implementation("com.facebook.react:flipper-integration")
161158
if (hermesEnabled.toBoolean()) {
162159
implementation("com.facebook.react:hermes-android")
163160
} else {

FabricExample/android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
<application
88
android:usesCleartextTraffic="true"
99
tools:targetApi="28"
10-
tools:ignore="GoogleAppIndexingWarning">
11-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
12-
</application>
10+
tools:ignore="GoogleAppIndexingWarning"/>
1311
</manifest>

0 commit comments

Comments
 (0)