Merge branch 'main' into @jpiasecki/display-contents

Author: j-piasecki

RNLiveMarkdown.podspec

@@ -34,6 +34,8 @@ Pod::Spec.new do |s|
     ].join(' '),
   }
 
+  s.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/cpp\"" }
+
   install_modules_dependencies(s)
 
   if ENV['USE_FRAMEWORKS'] != nil
@@ -43,10 +45,4 @@ Pod::Spec.new do |s|
     ])
     add_dependency(s, "React-rendererconsistency")
   end
-
-  s.subspec "newarch" do |ss|
-    ss.source_files         = "cpp/**/*.{cpp,h}"
-    ss.header_dir           = "RNLiveMarkdown"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/cpp\"" }
-  end
 end

android/src/main/cpp/CMakeLists.txt

@@ -25,18 +25,6 @@ target_link_libraries(
         ${CMAKE_PROJECT_NAME}
         fbjni::fbjni
         ReactAndroid::jsi
+        ReactAndroid::reactnative
         react-native-reanimated::worklets
 )
-
-if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-  target_link_libraries(${CMAKE_PROJECT_NAME} ReactAndroid::reactnative)
-elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
-  target_link_libraries(
-          ${CMAKE_PROJECT_NAME}
-          ReactAndroid::react_nativemodule_core
-          ReactAndroid::reactnativejni
-          ReactAndroid::runtimeexecutor
-  )
-else ()
-  message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
-endif ()

android/src/main/new_arch/CMakeLists.txt

@@ -40,41 +40,9 @@ target_link_libraries(
         ${LIB_TARGET_NAME}
         fbjni::fbjni
         ReactAndroid::jsi
+        ReactAndroid::reactnative
 )
 
-if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-  target_link_libraries(
-          ${LIB_TARGET_NAME}
-          ReactAndroid::reactnative
-  )
-elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
-  target_link_libraries(
-          ${LIB_TARGET_NAME}
-          ReactAndroid::fabricjni
-          ReactAndroid::folly_runtime
-          ReactAndroid::glog
-          ReactAndroid::react_debug
-          ReactAndroid::react_nativemodule_core
-          ReactAndroid::react_performance_timeline
-          ReactAndroid::react_render_consistency
-          ReactAndroid::react_render_core
-          ReactAndroid::react_render_debug
-          ReactAndroid::react_render_graphics
-          ReactAndroid::react_render_imagemanager
-          ReactAndroid::react_render_mapbuffer
-          ReactAndroid::react_render_observers_events
-          ReactAndroid::react_render_textlayoutmanager
-          ReactAndroid::reactnativejni
-          ReactAndroid::rrc_text
-          ReactAndroid::rrc_textinput
-          ReactAndroid::rrc_view
-          ReactAndroid::runtimeexecutor
-          ReactAndroid::yoga
-  )
-else ()
-  message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
-endif ()
-
 target_compile_options(
         ${LIB_TARGET_NAME}
         PRIVATE

example/ios/Podfile.lock

@@ -1499,30 +1499,7 @@ PODS:
     - React-logger (= 0.77.0)
     - React-perflogger (= 0.77.0)
     - React-utils (= 0.77.0)
-  - RNLiveMarkdown (0.1.247):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.11.18.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/newarch (= 0.1.247)
-    - RNReanimated/worklets
-    - Yoga
-  - RNLiveMarkdown/newarch (0.1.247):
+  - RNLiveMarkdown (0.1.250):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1947,7 +1924,7 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: 6e8d68583f39dc31ee65235110287277eb8556ef
   ReactCodegen: b793571cdd05c69db98095ccfca381d45f709d89
   ReactCommon: 1bd2dc684d7992acbf0dfee887b89a57a1ead86d
-  RNLiveMarkdown: cc21d7eed5a7addab9db31853b35b5a19a54f2f9
+  RNLiveMarkdown: 39d2be8d4d752bdbc7600bbb75d275ef0877aa32
   RNReanimated: 087d081f33387098097765f5a845f52c4abe2a3f
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: c0d8564af14a858f962607cd7306539cb2ace926

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.247",
+  "version": "0.1.250",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",