From 8fe59a09987125a5c94d5c45a3aec369dfdc8cdb Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Mon, 20 May 2024 20:21:49 +0530 Subject: [PATCH] bump RNN to 7.39.0 and remove patches (#20109) `react-native-navigation` library fixed android build errors for react-native `0.73` in this release : https://github.com/wix/react-native-navigation/releases/tag/7.39.0 upgrading to this version helps us remove the patches. --- ios/Podfile.lock | 10 ++++----- package.json | 2 +- ...t-native-navigation-button-presenter.patch | 22 ------------------- patches/react-native-navigation.patch | 19 ---------------- yarn.lock | 8 +++---- 5 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 patches/react-native-navigation-button-presenter.patch delete mode 100644 patches/react-native-navigation.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index de0537a29a..a16c380a87 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1119,14 +1119,14 @@ PODS: - React - ReactNativeCameraKit (14.0.0-beta13): - React-Core - - ReactNativeNavigation (7.38.3): + - ReactNativeNavigation (7.39.0): - HMSegmentedControl - React-Core - React-CoreModules - React-RCTImage - React-RCTText - - ReactNativeNavigation/Core (= 7.38.3) - - ReactNativeNavigation/Core (7.38.3): + - ReactNativeNavigation/Core (= 7.39.0) + - ReactNativeNavigation/Core (7.39.0): - HMSegmentedControl - React-Core - React-CoreModules @@ -1484,7 +1484,7 @@ SPEC CHECKSUMS: FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 530710e7949eb12c82670bd09e946becf50a3c2a + glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8 @@ -1551,7 +1551,7 @@ SPEC CHECKSUMS: ReactCommon: 2947b0bffd82ea0e58ca7928881152d4c6dae9af ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06 ReactNativeCameraKit: d95d3e19c514526a234d9f93c6db7e7f10eef9ea - ReactNativeNavigation: 46305e1026fa4cdcf0cfb3822932fc58d090668d + ReactNativeNavigation: 679d8c8bf3b8ae98d285bce810964d10da85dbdb RNCAsyncStorage: c913ede1fa163a71cea118ed4670bbaaa4b511bb RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6 diff --git a/package.json b/package.json index b43c5b23fc..3f9a452f88 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react-native-keychain": "8.1.2", "react-native-linear-gradient": "^2.8.0", "react-native-lottie-splash-screen": "^1.0.1", - "react-native-navigation": "7.38.3", + "react-native-navigation": "7.39.0", "react-native-orientation-locker": "^1.5.0", "react-native-permissions": "4.1.5", "react-native-reanimated": "3.6.1", diff --git a/patches/react-native-navigation-button-presenter.patch b/patches/react-native-navigation-button-presenter.patch deleted file mode 100644 index 444ae5b235..0000000000 --- a/patches/react-native-navigation-button-presenter.patch +++ /dev/null @@ -1,22 +0,0 @@ -# https://github.com/wix/react-native-navigation/issues/7819 - ---- ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt -+++ ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter-patched.kt -@@ -194,8 +194,8 @@ - - class WixAccessibilityDelegateCompat: AccessibilityDelegateCompat(){ - override fun onInitializeAccessibilityNodeInfo( -- host: View?, -- info: AccessibilityNodeInfoCompat? -+ host: View, -+ info: AccessibilityNodeInfoCompat - ) { - super.onInitializeAccessibilityNodeInfo(host, info) - -@@ -216,4 +216,4 @@ - } - - --} -\ No newline at end of file -+} diff --git a/patches/react-native-navigation.patch b/patches/react-native-navigation.patch deleted file mode 100644 index a531c923ee..0000000000 --- a/patches/react-native-navigation.patch +++ /dev/null @@ -1,19 +0,0 @@ -# https://github.com/wix/react-native-navigation/issues/7819 - ---- ./node_modules/react-native-navigation/lib/android/app/build.gradle -+++ ./node_modules/react-native-navigation/lib/android/app/build-patched.gradle -@@ -62,11 +62,11 @@ - } - } - compileOptions { -- sourceCompatibility JavaVersion.VERSION_1_8 -- targetCompatibility JavaVersion.VERSION_1_8 -+ sourceCompatibility JavaVersion.VERSION_17 -+ targetCompatibility JavaVersion.VERSION_17 - } - kotlinOptions { -- jvmTarget = JavaVersion.VERSION_1_8 -+ jvmTarget = JavaVersion.VERSION_17 - } - - flavorDimensions "RNN.reactNativeVersion" diff --git a/yarn.lock b/yarn.lock index d34d6348ec..64e0a1527f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9281,10 +9281,10 @@ react-native-lottie-splash-screen@^1.0.1: lottie-ios "3.2.3" lottie-react-native "^5.1.3" -react-native-navigation@7.38.3: - version "7.38.3" - resolved "https://registry.yarnpkg.com/react-native-navigation/-/react-native-navigation-7.38.3.tgz#ce1715bcf51a37296792e8f39ae8d1a4da3593a7" - integrity sha512-KCelGUYcUe+UreiEofjG6lBf6ie9+1xvFr77+GbTVCPCsO2GkBOuy8R/B3eoZvobLhalcLMHzka/bN9BLGUeeQ== +react-native-navigation@7.39.0: + version "7.39.0" + resolved "https://registry.yarnpkg.com/react-native-navigation/-/react-native-navigation-7.39.0.tgz#41655d5a822d53362dc1028e5d185d167f52f0bb" + integrity sha512-7xc4aGp3v/Eeh8MgIjApoZEE0GuefiMRQh/wpa43t1l1v5hqxzYV9J6dMd5XLzSbIYnJ1ZLd0gCHR5WQdE4O2Q== dependencies: hoist-non-react-statics "3.x.x" lodash "4.17.x"