Skip to content

Commit

Permalink
Bump React Native to 0.76 in example apps (#6636)
Browse files Browse the repository at this point in the history
## Summary

This PR updates our Example Apps to use React Native 0.76

## Test plan

---------

Co-authored-by: Tomasz Żelawski <[email protected]>
Co-authored-by: Tomasz Żelawski <[email protected]>
  • Loading branch information
3 people authored Oct 31, 2024
1 parent 07171bf commit cd7e201
Show file tree
Hide file tree
Showing 26 changed files with 831 additions and 1,393 deletions.

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions .yarn/patches/react-native-pager-view-npm-6.4.1-2322ade6e0.patch

This file was deleted.

This file was deleted.

Binary file not shown.
16 changes: 8 additions & 8 deletions apps/common-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
},
"devDependencies": {
"@react-native-async-storage/async-storage": "^1.24.0",
"@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.5.3#~/.yarn/patches/@react-native-community-slider-npm-4.5.3-6fedb47a11.patch",
"@react-native-community/slider": "^4.5.5",
"@react-native-masked-view/masked-view": "^0.3.1",
"@react-native-picker/picker": "patch:@react-native-picker/picker@npm%3A2.8.0#~/.yarn/patches/@react-native-picker-picker-npm-2.8.0-9d55144b66.patch",
"@react-native-picker/picker": "^2.9.0",
"@react-navigation/bottom-tabs": "^6.6.1",
"@react-navigation/native": "^6.1.18",
"@react-navigation/native-stack": "^6.11.0",
Expand All @@ -50,13 +50,13 @@
"patch-package": "^8.0.0",
"prettier": "^3.3.3",
"react": "18.3.1",
"react-native": "0.76.0-rc.3",
"react-native-gesture-handler": "2.20.0",
"react-native-pager-view": "patch:react-native-pager-view@npm%3A6.4.1#~/.yarn/patches/react-native-pager-view-npm-6.4.1-2322ade6e0.patch",
"react-native": "^0.76.1",
"react-native-gesture-handler": "2.20.2",
"react-native-pager-view": "^6.4.1",
"react-native-reanimated": "workspace:*",
"react-native-safe-area-context": "patch:react-native-safe-area-context@npm%3A4.11.0#~/.yarn/patches/react-native-safe-area-context-npm-4.11.0-f8b3b898df.patch",
"react-native-screens": "patch:react-native-screens@npm%3A3.34.0#~/.yarn/patches/react-native-screens-npm-3.34.0-3babbb1374.patch",
"react-native-svg": "15.8.0-rc.1",
"react-native-safe-area-context": "^4.13.1",
"react-native-screens": "3.35.0",
"react-native-svg": "^15.8.0",
"react-strict-dom": "0.0.27",
"typescript": "~5.3.0"
}
Expand Down
1 change: 1 addition & 0 deletions apps/fabric-example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ ruby ">= 2.6.10"
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
1 change: 1 addition & 0 deletions apps/fabric-example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ PLATFORMS
DEPENDENCIES
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
xcodeproj (< 1.26.0)

RUBY VERSION
ruby 3.2.2p53
Expand Down
2 changes: 1 addition & 1 deletion apps/fabric-example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ react {
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
reactNativeDir = file("../../../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
codegenDir = file("../../../../node_modules/react-native/node_modules/@react-native/codegen")
codegenDir = file("../../../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
cliFile = file("../../../../node_modules/react-native/cli.js")

Expand Down
8 changes: 0 additions & 8 deletions apps/fabric-example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
allprojects {
project.pluginManager.withPlugin("com.facebook.react") {
react {
reactNativeDir = rootProject.file("../../../node_modules/react-native/")
// codegenDir = rootProject.file("../../../node_modules/react-native-codegen/")
}
}
}
buildscript {
ext {
buildToolsVersion = "35.0.0"
Expand Down
12 changes: 2 additions & 10 deletions apps/fabric-example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
pluginManagement { includeBuild("../../../node_modules/react-native/node_modules/@react-native/gradle-plugin") }
pluginManagement { includeBuild('../../../node_modules/@react-native/gradle-plugin') }
plugins { id("com.facebook.react.settings") }
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
rootProject.name = 'FabricExample'
include ':app'
includeBuild('../../../node_modules/react-native/node_modules/@react-native/gradle-plugin')
// includeBuild('../../../node_modules/react-native') {
// dependencySubstitution {
// substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))
// substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid"))
// substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
// substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
// }
// }
includeBuild('../../../node_modules/@react-native/gradle-plugin')
Loading

0 comments on commit cd7e201

Please sign in to comment.