From d2699e4ae211a880fc384125c43554a350b61611 Mon Sep 17 00:00:00 2001
From: Hugo EXTRAT <extrat.h@gmail.com>
Date: Wed, 22 Jan 2025 14:58:09 +0100
Subject: [PATCH 1/2] fix(android): support RN 0.77

---
 CHANGELOG.md                                                 | 2 ++
 .../react/viewmanagers/AutoLayoutViewManagerDelegate.java    | 5 +++--
 .../react/viewmanagers/CellContainerManagerDelegate.java     | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a026a528..4423ef453 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- Changes for RN 0.77 support
+
 ## [1.7.1] - 2024-08-07
 
 - Add recomputeViewableItems method
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java b/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
index 4c9080790..29f81e03c 100644
--- a/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
+++ b/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
@@ -11,10 +11,11 @@
 
 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 AutoLayoutViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AutoLayoutViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class AutoLayoutViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & AutoLayoutViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public AutoLayoutViewManagerDelegate(U viewManager) {
     super(viewManager);
   }
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java b/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
index 2b64af7d5..4ba6e5fd8 100644
--- a/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
+++ b/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
@@ -11,10 +11,11 @@
 
 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 CellContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CellContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class CellContainerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & CellContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public CellContainerManagerDelegate(U viewManager) {
     super(viewManager);
   }

From 5d62f3bd972a20462bb8d6f4126d31d524e1fb7a Mon Sep 17 00:00:00 2001
From: Hugo EXTRAT <extrat.h@gmail.com>
Date: Wed, 22 Jan 2025 15:29:15 +0100
Subject: [PATCH 2/2] run cla