From 1bc4a9c20702be63735fa8547f8abb93fc346465 Mon Sep 17 00:00:00 2001 From: Kacper Kafara Date: Thu, 19 Dec 2024 14:03:30 +0100 Subject: [PATCH] Update patch for react-native-safe-area-context --- ...eact-native-safe-area-context+4.10.5.patch | 30 -------------- ...react-native-safe-area-context+5.0.0.patch | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 30 deletions(-) delete mode 100644 Example/patches/react-native-safe-area-context+4.10.5.patch create mode 100644 Example/patches/react-native-safe-area-context+5.0.0.patch diff --git a/Example/patches/react-native-safe-area-context+4.10.5.patch b/Example/patches/react-native-safe-area-context+4.10.5.patch deleted file mode 100644 index f736ae20bd..0000000000 --- a/Example/patches/react-native-safe-area-context+4.10.5.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/node_modules/react-native-safe-area-context/android/src/main/jni/CMakeLists.txt b/node_modules/react-native-safe-area-context/android/src/main/jni/CMakeLists.txt -index 4ee1c8f..3f63637 100644 ---- a/node_modules/react-native-safe-area-context/android/src/main/jni/CMakeLists.txt -+++ b/node_modules/react-native-safe-area-context/android/src/main/jni/CMakeLists.txt -@@ -39,22 +39,9 @@ target_include_directories( - - target_link_libraries( - ${LIB_TARGET_NAME} -- fbjni -- folly_runtime -- glog -- jsi -- react_codegen_rncore -- react_debug -- react_nativemodule_core -- react_render_core -- react_render_debug -- react_render_graphics -- react_render_mapbuffer -- react_render_componentregistry -- react_utils -- rrc_view -- turbomodulejsijni -- yoga -+ fbjni::fbjni -+ ReactAndroid::jsi -+ ReactAndroid::reactnative - ) - - target_compile_options( diff --git a/Example/patches/react-native-safe-area-context+5.0.0.patch b/Example/patches/react-native-safe-area-context+5.0.0.patch new file mode 100644 index 0000000000..4a59ca3a79 --- /dev/null +++ b/Example/patches/react-native-safe-area-context+5.0.0.patch @@ -0,0 +1,39 @@ +diff --git a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java +index dd4ef6c..5043a0f 100644 +--- a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java ++++ b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java +@@ -11,12 +11,13 @@ package com.facebook.react.viewmanagers; + + import android.view.View; + import androidx.annotation.Nullable; ++import com.facebook.react.uimanager.BaseViewManager; + import com.facebook.react.uimanager.BaseViewManagerDelegate; +-import com.facebook.react.uimanager.BaseViewManagerInterface; ++import com.facebook.react.uimanager.LayoutShadowNode; + + public class RNCSafeAreaProviderManagerDelegate< + T extends View, +- U extends BaseViewManagerInterface & RNCSafeAreaProviderManagerInterface> ++ U extends BaseViewManager & RNCSafeAreaProviderManagerInterface> + extends BaseViewManagerDelegate { + public RNCSafeAreaProviderManagerDelegate(U viewManager) { + super(viewManager); +diff --git a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java +index de1686c..2c077ce 100644 +--- a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java ++++ b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java +@@ -12,11 +12,12 @@ package com.facebook.react.viewmanagers; + import android.view.View; + import androidx.annotation.Nullable; + import com.facebook.react.bridge.ReadableMap; ++import com.facebook.react.uimanager.BaseViewManager; + import com.facebook.react.uimanager.BaseViewManagerDelegate; +-import com.facebook.react.uimanager.BaseViewManagerInterface; ++import com.facebook.react.uimanager.LayoutShadowNode; + + public class RNCSafeAreaViewManagerDelegate< +- T extends View, U extends BaseViewManagerInterface & RNCSafeAreaViewManagerInterface> ++ T extends View, U extends BaseViewManager & RNCSafeAreaViewManagerInterface> + extends BaseViewManagerDelegate { + public RNCSafeAreaViewManagerDelegate(U viewManager) { + super(viewManager);