diff --git a/android/app/build.gradle b/android/app/build.gradle index ffc2e5b9db..6e50e9965b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -381,6 +381,12 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.facebook.soloader:soloader:0.10.4' implementation 'com.facebook.fresco:animated-gif:2.5.0' + // react-native-screens was pointing to a newer version of this lib that is currently not supported in our app + implementation ('com.google.android.material:material:1.6.0') { + version { + strictly '1.6.0' + } + } } if (isNewArchitectureEnabled()) { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index aa2353fa93..4b4f504cd6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -565,7 +565,7 @@ PODS: - Yoga - RNRootView (1.0.3): - React - - RNScreens (3.13.1): + - RNScreens (3.29.0): - React-Core - React-RCTImage - RNSVG (13.8.0): @@ -980,7 +980,7 @@ SPEC CHECKSUMS: RNMathView: 4c8a3c081fa671ab3136c51fa0bdca7ffb708bd5 RNReanimated: 64573e25e078ae6bec03b891586d50b9ec284393 RNRootView: 895a4813dedeaca82db2fa868ca1c333d790e494 - RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19 + RNScreens: fa9b582d85ae5d62c91c66003b5278458fed7aaa RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902 RNVectorIcons: 7923e585eaeb139b9f4531d25a125a1500162a0b SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9 diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index e8a3b41033..c235f76768 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1720,7 +1720,7 @@ "$(inherited)", "$(SRCROOT)/../node_modules/rn-extensions-share/ios/**", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", - $PODS_CONFIGURATION_BUILD_DIR/Firebase, + "$PODS_CONFIGURATION_BUILD_DIR/Firebase", ); INFOPLIST_FILE = ShareRocketChatRN/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/package.json b/package.json index 506f6205e0..7033e669bb 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "react-native-reanimated": "2.8.0", "react-native-restart": "0.0.22", "react-native-safe-area-context": "3.2.0", - "react-native-screens": "3.13.1", + "react-native-screens": "3.29.0", "react-native-scrollable-tab-view": "ptomasroos/react-native-scrollable-tab-view", "react-native-simple-crypto": "RocketChat/react-native-simple-crypto#0.5.2", "react-native-skeleton-placeholder": "^5.2.3", diff --git a/yarn.lock b/yarn.lock index 8cc19aeeb1..30f9c9edff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17899,10 +17899,10 @@ react-native-safe-area-context@3.2.0: resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.2.0.tgz#06113c6b208f982d68ab5c3cebd199ca93db6941" integrity sha512-k2Nty4PwSnrg9HwrYeeE+EYqViYJoOFwEy9LxL5RIRfoqxAq/uQXNGwpUg2/u4gnKpBbEPa9eRh15KKMe/VHkA== -react-native-screens@3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.13.1.tgz#b3b1c5788dca25a71668909f66d87fb35c5c5241" - integrity sha512-xcrnuUs0qUrGpc2gOTDY4VgHHADQwp80mwR1prU/Q0JqbZN5W3koLhuOsT6FkSRKjR5t40l+4LcjhHdpqRB2HA== +react-native-screens@3.29.0: + version "3.29.0" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.29.0.tgz#1dee0326defbc1d4ef4e68287abb32a8e6b76b29" + integrity sha512-yB1GoAMamFAcYf4ku94uBPn0/ani9QG7NdI98beJ5cet2YFESYYzuEIuU+kt+CNRcO8qqKeugxlfgAa3HyTqlg== dependencies: react-freeze "^1.0.0" warn-once "^0.1.0"