Support React Native 0.76 (#483)

Expensify · Sep 12, 2024 · 14342fb · 14342fb
1 parent 8ce1772
commit 14342fb
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 41 deletions.
diff --git a/android/src/main/cpp/CMakeLists.txt b/android/src/main/cpp/CMakeLists.txt
@@ -18,8 +18,18 @@ find_package(fbjni REQUIRED CONFIG)
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(hermes-engine REQUIRED CONFIG)
 
-target_link_libraries(${CMAKE_PROJECT_NAME}
-        fbjni::fbjni
-        ReactAndroid::jsi
-        ReactAndroid::reactnativejni
-        hermes-engine::libhermes)
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(${CMAKE_PROJECT_NAME}
+          fbjni::fbjni
+          ReactAndroid::jsi
+          ReactAndroid::reactnative
+          hermes-engine::libhermes)
+elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
+  target_link_libraries(${CMAKE_PROJECT_NAME}
+          fbjni::fbjni
+          ReactAndroid::jsi
+          ReactAndroid::reactnativejni
+          hermes-engine::libhermes)
+else ()
+  message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
+endif ()
diff --git a/android/src/main/new_arch/CMakeLists.txt b/android/src/main/new_arch/CMakeLists.txt
@@ -36,42 +36,53 @@ target_include_directories(
 
 find_package(ReactAndroid REQUIRED CONFIG)
 
-target_link_libraries(
-  ${LIB_TARGET_NAME}
-  ReactAndroid::rrc_text
-  ReactAndroid::rrc_textinput
-  ReactAndroid::react_render_textlayoutmanager
-  ReactAndroid::react_render_imagemanager
-  ReactAndroid::reactnativejni
-  ReactAndroid::mapbufferjni
-  fabricjni
-  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
-  ReactAndroid::react_render_uimanager
-  ReactAndroid::react_render_scheduler
-  react_utils
-  runtimeexecutor
-  rrc_view
-  turbomodulejsijni
-  yoga
-  android
-  log
-  mapbufferjni
-  reactnativejni
-  react_render_consistency
-  react_performance_timeline
-  react_render_observers_events
-  react_featureflags
-)
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::rrc_text
+    ReactAndroid::rrc_textinput
+    ReactAndroid::react_render_textlayoutmanager
+    ReactAndroid::react_render_imagemanager
+    ReactAndroid::reactnativejni
+    ReactAndroid::mapbufferjni
+    fabricjni
+    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
+    ReactAndroid::react_render_uimanager
+    ReactAndroid::react_render_scheduler
+    react_utils
+    runtimeexecutor
+    rrc_view
+    turbomodulejsijni
+    yoga
+    android
+    log
+    mapbufferjni
+    reactnativejni
+    react_render_consistency
+    react_performance_timeline
+    react_render_observers_events
+    react_featureflags
+  )
+else ()
+  message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
+endif ()
 
 target_compile_options(
   ${LIB_TARGET_NAME}