react-native-keys icon indicating copy to clipboard operation
react-native-keys copied to clipboard

fix: [email protected] Android compatibility

Open efstathiosntonas opened this issue 1 year ago • 1 comments

Updated CMakeLists.txt to comply with new [email protected] specs

efstathiosntonas avatar Oct 25 '24 10:10 efstathiosntonas

Hi @numandev1, this is good to go.

For those who can't wait:

react-native-keys+0.7.10.patch

diff --git a/node_modules/react-native-keys/android/CMakeLists.txt b/node_modules/react-native-keys/android/CMakeLists.txt
index f453363..8f262ec 100644
--- a/node_modules/react-native-keys/android/CMakeLists.txt
+++ b/node_modules/react-native-keys/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)  # Add this line to find fbjni

     include_directories(
         ${PACKAGE_NAME}
@@ -49,7 +50,17 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)

     find_package(openssl REQUIRED CONFIG)

-    target_link_libraries(
+    if (REACTNATIVE_MERGED_SO OR ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+     target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}
+        ReactAndroid::reactnative
+        ReactAndroid::jsi
+        fbjni::fbjni
+        openssl::crypto
+      )
+    else()
+      target_link_libraries(
         ${PACKAGE_NAME}
         ${LOG_LIB}
         ReactAndroid::jsi
@@ -57,7 +68,8 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
         ReactAndroid::react_nativemodule_core
         android
         openssl::crypto
-    )
+     )
+    endif()
 else()
     add_library(
         ${PACKAGE_NAME}

efstathiosntonas avatar Oct 31 '24 07:10 efstathiosntonas

Implemented in PR

ngocle2497 avatar Jul 27 '25 14:07 ngocle2497