Skip to content

Commit 4fca5e4

Browse files
committed
Migrate to React Native 0.73 (#54)
* Migrate to React Native 0.73 * Update from 0.73.2 to 0.73.6 * Undo change to JVM heap allocation size * Remove CI changes
1 parent f4e9308 commit 4fca5e4

32 files changed

+1828
-1133
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ sample/ios/Pods/
7676
.env.development.local
7777
.env.test.local
7878
.env.production.local
79+
**/.xcode.env.local
7980

8081
# Build
8182
.build
@@ -91,7 +92,6 @@ modules/@shopify/checkout-sheet-kit/android/gradlew.bat
9192

9293
# Sample bundle
9394
**/index.android.bundle
94-
.xcode.env.local
9595

9696
# Local gems
9797
sample/vendor

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['module:metro-react-native-babel-preset'],
2+
presets: ['module:@react-native/babel-preset'],
33
};

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,22 @@
2727
"@babel/core": "^7.20.0",
2828
"@babel/preset-env": "^7.20.0",
2929
"@babel/runtime": "^7.20.0",
30-
"@react-native/eslint-config": "^0.72.2",
31-
"@react-native/metro-config": "^0.72.11",
30+
"@react-native/babel-preset": "^0.73.21",
31+
"@react-native/eslint-config": "^0.73.2",
32+
"@react-native/metro-config": "^0.73.5",
33+
"@react-native/typescript-config": "^0.74.0",
3234
"@tsconfig/react-native": "^3.0.0",
3335
"@types/jest": "^29.5.10",
3436
"@types/react": "^18",
35-
"@types/react-native": "0.72.8",
3637
"@types/react-native-dotenv": "^0.2.1",
3738
"@types/react-test-renderer": "^18.0.0",
3839
"babel-jest": "^29.7.0",
3940
"eslint": "^8.19.0",
41+
"eslint-plugin-prettier": "^5.1.3",
4042
"jest": "^29.2.1",
41-
"prettier": "2",
43+
"prettier": "^3.2.5",
4244
"react": "^18.2.0",
43-
"react-native": "0.72.8",
45+
"react-native": "0.73.6",
4446
"react-native-dotenv": "^3.4.9",
4547
"react-native-gesture-handler": "^2.15.0",
4648
"react-native-gradle-plugin": "^0.71.19",

sample/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ 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.15.2'
7-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
6+
gem 'cocoapods', '>= 1.13', '< 1.15'
7+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

sample/Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ GEM
1818
atomos (0.1.3)
1919
base64 (0.2.0)
2020
claide (1.1.0)
21-
cocoapods (1.15.2)
21+
cocoapods (1.14.3)
2222
addressable (~> 2.8)
2323
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.15.2)
24+
cocoapods-core (= 1.14.3)
2525
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2626
cocoapods-downloader (>= 2.1, < 3.0)
2727
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,7 +36,7 @@ GEM
3636
nap (~> 1.0)
3737
ruby-macho (>= 2.3.0, < 3.0)
3838
xcodeproj (>= 1.23.0, < 2.0)
39-
cocoapods-core (1.15.2)
39+
cocoapods-core (1.14.3)
4040
activesupport (>= 5.0, < 8)
4141
addressable (~> 2.8)
4242
algoliasearch (~> 1.0)
@@ -93,8 +93,8 @@ PLATFORMS
9393
ruby
9494

9595
DEPENDENCIES
96-
activesupport (>= 6.1.7.3, < 7.1.0)
97-
cocoapods (~> 1.15.2)
96+
activesupport (>= 6.1.7.5, < 7.1.0)
97+
cocoapods (>= 1.13, < 1.15)
9898

9999
RUBY VERSION
100100
ruby 3.1.2p20

sample/android/app/build.gradle

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

45
project.ext["REACT_NATIVE_NODE_MODULES_DIR"] = file("../../../node_modules/react-native")
@@ -72,8 +73,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
7273

7374
android {
7475
ndkVersion rootProject.ext.ndkVersion
75-
76-
compileSdkVersion rootProject.ext.compileSdkVersion
76+
buildToolsVersion rootProject.ext.buildToolsVersion
77+
compileSdk rootProject.ext.compileSdkVersion
7778

7879
lintOptions {
7980
checkDependencies false
@@ -123,6 +124,8 @@ android {
123124
dependencies {
124125
// The version of react-native is set by the React Native Gradle Plugin
125126
implementation("com.facebook.react:react-android")
127+
implementation("com.facebook.react:flipper-integration")
128+
126129
implementation project(":react-native-config")
127130

128131
// Test dependencies
@@ -133,12 +136,6 @@ dependencies {
133136
testImplementation "org.assertj:assertj-core:3.24.2"
134137
testImplementation("com.shopify:checkout-sheet-kit:${SHOPIFY_CHECKOUT_SDK_VERSION}")
135138

136-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
137-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
138-
exclude group:'com.squareup.okhttp3', module:'okhttp'
139-
}
140-
141-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
142139
if (hermesEnabled.toBoolean()) {
143140
implementation("com.facebook.react:hermes-android")
144141
} else {

sample/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>

sample/android/app/src/debug/java/com/reactnative/ReactNativeFlipper.java

Lines changed: 0 additions & 75 deletions
This file was deleted.
134 Bytes
Loading
100 Bytes
Loading

0 commit comments

Comments
 (0)