Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React Native 0.74 upgrade #40548

Closed
wants to merge 168 commits into from
Closed
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
ba2f779
Initial upgrade
MrRefactor Apr 11, 2024
dc8775d
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Apr 11, 2024
59ee0c4
Dependency reinstall
MrRefactor Apr 17, 2024
5a52d22
Update Podfile and patches
MrRefactor Apr 19, 2024
dd3bd88
Update @onfido/react-native-sdk to include gradle 8
MrRefactor Apr 19, 2024
d788526
Update expo to pre release beta version
MrRefactor Apr 19, 2024
d3fd7f0
Update expo-av and remove patch
MrRefactor Apr 19, 2024
c1a7494
Add expo to overrides and update versions of expo libs
MrRefactor Apr 19, 2024
166ab46
Add react-native-quick-sqlite patch for iOS builds
MrRefactor Apr 19, 2024
25712ce
Update/remove outdated patches
MrRefactor Apr 19, 2024
9e85c60
Update react-native patches
MrRefactor Apr 19, 2024
60cd192
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Apr 21, 2024
c161f78
Update libs for rn 0.74
MrRefactor Apr 22, 2024
f92f238
Change Airship min deploy version
MrRefactor Apr 22, 2024
aecc096
rn-clipboard patch
MrRefactor Apr 22, 2024
2d88c21
rnmapbox patch + patch update
MrRefactor Apr 22, 2024
57f6125
rn-quick-sqlite & rn-webview patch update
MrRefactor Apr 22, 2024
86cc8d9
rn-svg patch
MrRefactor Apr 22, 2024
10de97a
react native textinput patch update
MrRefactor Apr 22, 2024
7e868fe
fix inverted flat list patch removal
MrRefactor Apr 22, 2024
7d2c993
Update patch for react-native-plaid-link-sdk
MrRefactor Apr 22, 2024
d4036db
Change react-native version from 0.74.0-rc.9 to 0.74.0
MrRefactor Apr 23, 2024
0adae9e
Lock react-native-vision-camera to version 4.0.0-beta.13 and apply pa…
MrRefactor Apr 24, 2024
621ca54
Upgrade react-native-picker & react-native-screens
MrRefactor Apr 25, 2024
8007989
Update version of react-native-gesture-handler and react-native-live-…
MrRefactor Apr 29, 2024
e0e8fcd
Update rnmapbox/map patch for iOS
MrRefactor Apr 29, 2024
4ba14ba
Disable bridgeless mode on iOS
MrRefactor Apr 29, 2024
3e6a9f7
Update react-native-vision-camera patch to fix build issues on iOS
MrRefactor Apr 29, 2024
62bd856
Update version of @react-native-async-storage/async-storage
MrRefactor Apr 29, 2024
3acb528
Dependencies reinstall
MrRefactor Apr 29, 2024
7b016b5
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor May 6, 2024
c9e6c9d
Update patches after merge with main
MrRefactor May 8, 2024
36bfa44
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor May 14, 2024
5856706
Upgrade rnmapbox/maps to 10.1.23 and update dependencies
MrRefactor May 14, 2024
ed5e570
react-native-device-info patch
MrRefactor May 31, 2024
2dd0308
react-native mapbufferjni patch
MrRefactor May 31, 2024
0930768
react-native-live-markdown patch
MrRefactor May 31, 2024
a5c5305
react-native bridgeless android patch
MrRefactor May 31, 2024
fc7eb08
react-native-vision-camera update patch
MrRefactor May 31, 2024
7c27fd7
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor May 31, 2024
d206990
Reainstall dependencies
MrRefactor May 31, 2024
315a820
@react-native-community/netinfo update patch
MrRefactor May 31, 2024
3c907f5
react-native-document-picker patch
MrRefactor May 31, 2024
249a0bb
Update react-native-reanimated to 3.11.0
MrRefactor May 31, 2024
a1bf9c9
Update react-native-safe-area-context to 4.10.3
MrRefactor May 31, 2024
8510813
Update versions of patches
MrRefactor May 31, 2024
25a2e6a
Update onfido/react-native-sdk patch
MrRefactor May 31, 2024
649cc83
Reainstall dependencies
MrRefactor Jun 4, 2024
2512b86
Remove multiplicated includes in settings.gradle
MrRefactor Jun 5, 2024
9d9d37d
Upgrade react-native-svg to 15.3.0 and remove patch
MrRefactor Jun 5, 2024
e61b69e
Adjust minSdkVersion in patches
MrRefactor Jun 5, 2024
4ac4311
Override react-native-cli version and adjust patches
MrRefactor Jun 5, 2024
11f932c
Upgrade react-native to 0.74.1 and reinstall dependencies
MrRefactor Jun 5, 2024
ed29d46
Upgrade expo to 51.0.0
MrRefactor Jun 5, 2024
c87e3d9
Update patches
MrRefactor Jun 5, 2024
1e26c67
Align libs for rn 0.74.1
MrRefactor Jun 5, 2024
7af110d
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 5, 2024
df819bb
Reinstall deps
MrRefactor Jun 5, 2024
6eeef78
fix tsc errors for cursor styles
kbieganowski Jun 5, 2024
985a5c6
Update github actions
MrRefactor Jun 5, 2024
b82f337
add @types/node to compilerOptions
kbieganowski Jun 5, 2024
dae01ef
bump reassure to latest version
kbieganowski Jun 5, 2024
98efaf8
update validateReassureOutput gh action
kbieganowski Jun 5, 2024
5402779
Remove duplicate of gradle-wrapper.properties
MrRefactor Jun 5, 2024
5125515
fix: verifyPodfile script
kubabutkiewicz Jun 6, 2024
206e3a5
Merge branch 'react-native-0.74-upgrade' of github.com:MrRefactor/App…
kubabutkiewicz Jun 6, 2024
207cfcd
fix: 2fa
kubabutkiewicz Jun 6, 2024
77936ca
storybook version upgrade
kbieganowski Jun 7, 2024
7e9fa14
Add patch for inverted flatlist
MrRefactor Jun 7, 2024
a42e6c8
Reinstall pods
MrRefactor Jun 7, 2024
05b371c
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 7, 2024
3276989
Update github actions
MrRefactor Jun 7, 2024
8ad446d
Fix eslint
MrRefactor Jun 8, 2024
5044f3f
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 10, 2024
53b73c2
Reinstall pods
MrRefactor Jun 10, 2024
1d721c3
fix: modal issue
kubabutkiewicz Jun 10, 2024
9df8dff
patch expo-asset to fix storybook fail on CI
kbieganowski Jun 11, 2024
a7b61f6
Upgrade rn to 0.74.2
MrRefactor Jun 11, 2024
a13a974
Disable useNativeDriver on android
MrRefactor Jun 11, 2024
5fad813
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 11, 2024
23d95a5
fix: verifyPodfile issue
kubabutkiewicz Jun 14, 2024
eb4a637
Apply workaround patch for @rnmapbox/maps
MrRefactor Jun 14, 2024
66dc307
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 14, 2024
1a55e32
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 17, 2024
45ac8d8
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 18, 2024
772252a
Reinstall pods
MrRefactor Jun 18, 2024
bc6f02c
fix: feature training modal
kubabutkiewicz Jun 19, 2024
a52e239
fix: moved GestureHandlerRootView deeper
kubabutkiewicz Jun 20, 2024
17a1af3
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 24, 2024
9c03722
Reinstall deps
MrRefactor Jun 24, 2024
fc5b0eb
Update patches
MrRefactor Jun 24, 2024
45d9ded
Add useNativeDriver react-native patch
MrRefactor Jun 24, 2024
3cea9b7
Fix verifyPodfile script
MrRefactor Jun 24, 2024
2a8c75e
Align jest version
MrRefactor Jun 24, 2024
c1a3d3f
fix: displaying attachment preview
kubabutkiewicz Jun 26, 2024
f58a162
Update expo libraries to latest versions
MrRefactor Jun 26, 2024
0c2e15b
checking tests in CI
kubabutkiewicz Jun 26, 2024
19704ef
fix: attachments in pagerview
kubabutkiewicz Jun 27, 2024
01596d9
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jun 27, 2024
96640c6
Reinstall pods
MrRefactor Jun 27, 2024
b85b7ec
fix: tests
kubabutkiewicz Jun 27, 2024
4956372
fix tests wip
kubabutkiewicz Jun 28, 2024
c6468ed
fix: web crash
kubabutkiewicz Jun 28, 2024
a03d7a8
Revert "fix: web crash"
kubabutkiewicz Jul 1, 2024
6f3ea46
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 1, 2024
893a325
Update github actions
MrRefactor Jul 1, 2024
fb0f410
wip: fix tests
kubabutkiewicz Jul 1, 2024
2fbd405
Revert "wip: fix tests"
kubabutkiewicz Jul 1, 2024
c5b3274
wip fix tests
kubabutkiewicz Jul 1, 2024
615a331
revert
kubabutkiewicz Jul 1, 2024
112e3e3
fix: wip tests
kubabutkiewicz Jul 1, 2024
3a4821a
wip tests
kubabutkiewicz Jul 1, 2024
be08d1d
revert prev changes
kubabutkiewicz Jul 1, 2024
b6a846a
wip fix tests
kubabutkiewicz Jul 1, 2024
c6f2b0c
Update react-native-release-profiler
MrRefactor Jul 2, 2024
a95dd08
Add patch for strictMode fix
MrRefactor Jul 2, 2024
efa980c
Fix iOS video crash
MrRefactor Jul 2, 2024
1af73c4
Update patches
MrRefactor Jul 2, 2024
d59ecd9
fix: upgrade expo sdk
kubabutkiewicz Jul 3, 2024
730078d
fix: expo modules core patch
kubabutkiewicz Jul 3, 2024
10b94a4
fix: expo asset patch
kubabutkiewicz Jul 3, 2024
e64423e
fix: expo asset patch
kubabutkiewicz Jul 3, 2024
2a7eace
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 10, 2024
986e777
Reinstall deps and rename patch after merge
MrRefactor Jul 10, 2024
88b9aa0
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 12, 2024
07355d6
Reinstall deps and rename patch after merge
MrRefactor Jul 15, 2024
b168077
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 15, 2024
bf9058f
Update react native to 0.74.3
MrRefactor Jul 16, 2024
16dc880
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 16, 2024
d6fc81b
Update react-native-clipboard to 1.14.0 and remove patch
MrRefactor Jul 16, 2024
58af8fe
fix: modals flickering
kubabutkiewicz Jul 18, 2024
49337b5
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 18, 2024
d27a6fa
Reinstall deps and rename patch after merge
MrRefactor Jul 18, 2024
3fde8e5
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 18, 2024
79ef74c
Reinstall pods
MrRefactor Jul 18, 2024
0317a3b
Update libs and remove patches
MrRefactor Jul 19, 2024
86749f8
Fix ts & lint
MrRefactor Jul 19, 2024
61c4319
Prettier fix
MrRefactor Jul 19, 2024
801bd34
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 23, 2024
192b9ec
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 26, 2024
3212a43
Add patches for composer & navigation animations
MrRefactor Jul 26, 2024
f88a591
Update reanimated & patches
MrRefactor Jul 30, 2024
c754897
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 30, 2024
8c07917
Reinstall pods
MrRefactor Jul 30, 2024
9df0611
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Jul 30, 2024
8931906
Fix crash on attachment load
MrRefactor Jul 31, 2024
9d77485
Fix attachment load correct element
MrRefactor Jul 31, 2024
7920c88
Fix crash on SectionList
MrRefactor Jul 31, 2024
3454ebf
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 1, 2024
f39bd33
Align textinput-clear-command patch for 0.74
MrRefactor Aug 1, 2024
1a311ff
fix: typecheck
kubabutkiewicz Aug 1, 2024
21ed9cc
Upgrade rn to 0.74.4
MrRefactor Aug 1, 2024
9c98bd5
Remove patch
MrRefactor Aug 1, 2024
cb4f2ce
Rename patches
MrRefactor Aug 1, 2024
7a52c78
Add patch to fix storybook
MrRefactor Aug 1, 2024
9666cce
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 2, 2024
d27bee0
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 5, 2024
422f31b
Apply workaround for suggestion box positioning on android
MrRefactor Aug 5, 2024
9fcf779
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 5, 2024
1788e55
Update expo patches
MrRefactor Aug 5, 2024
e9a9851
Update hermes-engine pod version
MrRefactor Aug 5, 2024
b5068bf
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 6, 2024
ee87aec
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 6, 2024
5cc4d08
Remove workaround for suggestion list
MrRefactor Aug 6, 2024
2523246
temporary workaround for suggestion box RN74
perunt Aug 6, 2024
3200499
typo
perunt Aug 7, 2024
86584db
Merge pull request #1 from perunt/react-native-0.74-upgrade
MrRefactor Aug 7, 2024
e1e40b3
Merge branch 'main' into react-native-0.74-upgrade
MrRefactor Aug 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ DerivedData
*.p12
*.mobileprovision
ios-fastlane-json-key.json
ios/.xcode.env.local
**/.xcode.env.local

# Android/IntelliJ
#
Expand Down Expand Up @@ -73,7 +73,7 @@ android/app/android-fastlane-json-key.json
*.jsbundle

# Ruby / CocoaPods
/ios/Pods/
**/Pods/
/vendor/bundle/

# Local DEV config
Expand Down Expand Up @@ -125,3 +125,11 @@ config/webpack/*.pem
.expo
dist/
web-build/

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ source "https://rubygems.org"
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem "cocoapods", "~> 1.13"
gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
MrRefactor marked this conversation as resolved.
Show resolved Hide resolved
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
gem "fastlane", "~> 2"
gem "xcpretty", "~> 0"

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activesupport (>= 6.1.7.3, < 7.1.0)
cocoapods (~> 1.13)
activesupport (>= 6.1.7.5, < 7.1.0)
cocoapods (>= 1.13, < 1.15)
fastlane (~> 2)
fastlane-plugin-aws_s3
xcpretty (~> 0)
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/res/drawable/rn_edit_text_material.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">

android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
>
<selector>
<!--
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 21
minSdkVersion = 23
compileSdkVersion = 34
targetSdkVersion = 34
ndkVersion = "25.1.8937393"
ndkVersion = "26.1.10909125"

androidXCore = "1.0.2"
multiDexEnabled = true
googlePlayServicesVersion = "17.0.0"
kotlinVersion = '1.8.10'
kotlinVersion = "1.9.22"

// This property configures the type of Mapbox SDK used by the @rnmapbox/maps library.
// "mapbox" indicates the usage of the Mapbox SDK.
Expand Down
7 changes: 7 additions & 0 deletions android/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
Loading
Loading