From f6af5fbf0c5057c6b60ff0ac3f16db184546cf2f Mon Sep 17 00:00:00 2001
From: Efstathios Ntonas <stathis@hikiapp.com>
Date: Fri, 25 Oct 2024 13:34:17 +0300
Subject: [PATCH 1/2] fix: react-native@0.76.0 Android compatibility

---
 android/CMakeLists.txt | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index f453363..082a653 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -49,7 +49,18 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
 
     find_package(openssl REQUIRED CONFIG)
 
-    target_link_libraries(
+    if (REACTNATIVE_MERGED_SO)
+     target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}
+        fbjni
+        jsi
+        reactnative
+        android
+        openssl::crypto
+      )
+    else()
+      target_link_libraries(
         ${PACKAGE_NAME}
         ${LOG_LIB}
         ReactAndroid::jsi
@@ -57,7 +68,7 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
         ReactAndroid::react_nativemodule_core
         android
         openssl::crypto
-    )
+     )
 else()
     add_library(
         ${PACKAGE_NAME}

From f3ecf214658e60a44b4855634b42deef26290f63 Mon Sep 17 00:00:00 2001
From: Efstathios Ntonas <stathis@hikiapp.com>
Date: Thu, 31 Oct 2024 09:02:17 +0200
Subject: [PATCH 2/2] chore: proper target_link_libraries

---
 android/CMakeLists.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 082a653..156775c 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -9,6 +9,7 @@ set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
     # Consume shared libraries and headers from prefabs
     find_package(ReactAndroid REQUIRED CONFIG)
+    find_package(fbjni REQUIRED CONFIG)
 
     include_directories(
         ${PACKAGE_NAME}
@@ -49,14 +50,13 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
 
     find_package(openssl REQUIRED CONFIG)
 
-    if (REACTNATIVE_MERGED_SO)
+    if (REACTNATIVE_MERGED_SO OR ${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 76)
      target_link_libraries(
         ${PACKAGE_NAME}
         ${LOG_LIB}
-        fbjni
-        jsi
-        reactnative
-        android
+        ReactAndroid::reactnative
+        ReactAndroid::jsi
+        fbjni::fbjni
         openssl::crypto
       )
     else()
@@ -69,6 +69,7 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
         android
         openssl::crypto
      )
+    endif()
 else()
     add_library(
         ${PACKAGE_NAME}