Fix missing headers on iOS when using static linkage (#150)

Expensify · Feb 5, 2024 · 6363592 · 6363592
1 parent ce890a9
commit 6363592
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 41 deletions.
diff --git a/react-native-live-markdown.podspec → RNLiveMarkdown.podspec b/react-native-live-markdown.podspec → RNLiveMarkdown.podspec
@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
-  s.name         = "react-native-live-markdown"
+  s.name         = "RNLiveMarkdown"
   s.version      = package["version"]
   s.summary      = package["description"]
   s.homepage     = package["homepage"]

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -375,9 +375,6 @@ PODS:
   - React-jsinspector (0.72.9)
   - React-logger (0.72.9):
     - glog
-  - react-native-live-markdown (0.1.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core
   - React-NativeModulesApple (0.72.9):
     - hermes-engine
     - React-callinvoker
@@ -488,6 +485,9 @@ PODS:
     - React-jsi (= 0.72.9)
     - React-logger (= 0.72.9)
     - React-perflogger (= 0.72.9)
+  - RNLiveMarkdown (0.1.0):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Core
   - SocketRocket (0.6.1)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -539,7 +539,6 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
-  - react-native-live-markdown (from `../..`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -557,6 +556,7 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNLiveMarkdown (from `../..`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -619,8 +619,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
-  react-native-live-markdown:
-    :path: "../.."
   React-NativeModulesApple:
     :path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
   React-perflogger:
@@ -655,11 +653,13 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNLiveMarkdown:
+    :path: "../.."
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: dc178b8748748c036ef9493a5d59d6d1f91a36ce
@@ -692,7 +692,6 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 5a169b1dd1abad06bed40ab7e1aca883c657d865
   React-jsinspector: 54205b269da20c51417e0fc02c4cde9f29a4bf1a
   React-logger: f42d2f2bc4cbb5d19d7c0ce84b8741b1e54e88c8
-  react-native-live-markdown: 5722e2203fc2fab86dcb50fdaef92ca8b6c0fdec
   React-NativeModulesApple: 9f72feb8a04020b32417f768a7e1e40eec91fef4
   React-perflogger: cb433f318c6667060fc1f62e26eb58d6eb30a627
   React-RCTActionSheet: 0af3f8ac067e8a1dde902810b7ad169d0a0ec31e
@@ -710,6 +709,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: a7b1442e155c6f131d8bdfaac47abdc303f50788
   React-utils: a3ffbc321572ee91911d7bc30965abe9aa4e16af
   ReactCommon: 180205f326d59f52e12fa724f5278fcf8fb6afc3
+  RNLiveMarkdown: e76d6cd583fe59179100055b2e58f444b807ac66
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: eddf2bbe4a896454c248a8f23b4355891eb720a6
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

diff --git a/ios/MarkdownLayoutManager.h b/ios/MarkdownLayoutManager.h
@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/MarkdownLayoutManager.mm b/ios/MarkdownLayoutManager.mm
@@ -1,4 +1,4 @@
-#import <react-native-live-markdown/MarkdownLayoutManager.h>
+#import <RNLiveMarkdown/MarkdownLayoutManager.h>
 
 @implementation MarkdownLayoutManager
 

diff --git a/ios/MarkdownTextInputDecoratorComponentView.mm b/ios/MarkdownTextInputDecoratorComponentView.mm
@@ -3,9 +3,9 @@
 #import <react/renderer/components/RNLiveMarkdownSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNLiveMarkdownSpec/Props.h>
 
-#import <react-native-live-markdown/MarkdownTextInputDecoratorComponentView.h>
-#import <react-native-live-markdown/MarkdownTextInputDecoratorView.h>
-#import <react-native-live-markdown/RCTMarkdownStyle.h>
+#import <RNLiveMarkdown/MarkdownTextInputDecoratorComponentView.h>
+#import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
+#import <RNLiveMarkdown/RCTMarkdownStyle.h>
 
 #import "RCTFabricComponentsPlugins.h"
 

diff --git a/ios/MarkdownTextInputDecoratorView.h b/ios/MarkdownTextInputDecoratorView.h
@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
-#import <react-native-live-markdown/RCTMarkdownStyle.h>
+#import <RNLiveMarkdown/RCTMarkdownStyle.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/MarkdownTextInputDecoratorView.mm b/ios/MarkdownTextInputDecoratorView.mm
@@ -1,15 +1,15 @@
 #import <React/RCTUITextField.h>
-#import <react/debug/react_native_assert.h>
+#import "react_native_assert.h"
 
-#import <react-native-live-markdown/MarkdownLayoutManager.h>
-#import <react-native-live-markdown/MarkdownTextInputDecoratorView.h>
-#import <react-native-live-markdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
-#import <react-native-live-markdown/RCTUITextView+Markdown.h>
+#import <RNLiveMarkdown/MarkdownLayoutManager.h>
+#import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
+#import <RNLiveMarkdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
+#import <RNLiveMarkdown/RCTUITextView+Markdown.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <react-native-live-markdown/RCTTextInputComponentView+Markdown.h>
+#import <RNLiveMarkdown/RCTTextInputComponentView+Markdown.h>
 #else
-#import <react-native-live-markdown/RCTBaseTextInputView+Markdown.h>
+#import <RNLiveMarkdown/RCTBaseTextInputView+Markdown.h>
 #endif /* RCT_NEW_ARCH_ENABLED */
 
 #import <objc/runtime.h>

diff --git a/ios/MarkdownTextInputDecoratorViewManager.mm b/ios/MarkdownTextInputDecoratorViewManager.mm
@@ -1,5 +1,5 @@
-#import <react-native-live-markdown/MarkdownTextInputDecoratorViewManager.h>
-#import <react-native-live-markdown/MarkdownTextInputDecoratorView.h>
+#import <RNLiveMarkdown/MarkdownTextInputDecoratorViewManager.h>
+#import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
 
 @implementation MarkdownTextInputDecoratorViewManager
 

diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h
@@ -1,5 +1,5 @@
 #import <React/RCTBackedTextInputDelegateAdapter.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.m b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.m
@@ -1,5 +1,5 @@
-#import <react-native-live-markdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 #import <React/RCTUITextField.h>
 #import <objc/message.h>
 

diff --git a/ios/RCTBaseTextInputView+Markdown.h b/ios/RCTBaseTextInputView+Markdown.h
@@ -1,5 +1,5 @@
 #import <React/RCTBaseTextInputView.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/RCTBaseTextInputView+Markdown.m b/ios/RCTBaseTextInputView+Markdown.m
@@ -1,5 +1,5 @@
-#import <react-native-live-markdown/RCTBaseTextInputView+Markdown.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTBaseTextInputView+Markdown.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 #import <objc/message.h>
 
 @implementation RCTBaseTextInputView (Markdown)

diff --git a/ios/RCTMarkdownStyle.mm b/ios/RCTMarkdownStyle.mm
@@ -1,9 +1,9 @@
-#import <react-native-live-markdown/RCTMarkdownStyle.h>
+#import <RNLiveMarkdown/RCTMarkdownStyle.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #else
-#import <React-Core/React/RCTConvert.h>
+#import <React/RCTConvert.h>
 #endif /* RCT_NEW_ARCH_ENABLED */
 
 @implementation RCTMarkdownStyle

diff --git a/ios/RCTMarkdownUtils.h b/ios/RCTMarkdownUtils.h
@@ -1,5 +1,5 @@
 #import <React/RCTBackedTextInputViewProtocol.h>
-#import <react-native-live-markdown/RCTMarkdownStyle.h>
+#import <RNLiveMarkdown/RCTMarkdownStyle.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/RCTMarkdownUtils.mm b/ios/RCTMarkdownUtils.mm
@@ -1,5 +1,5 @@
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
-#import <react/debug/react_native_assert.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
+#import "react_native_assert.h"
 #import <React/RCTAssert.h>
 #import <React/RCTFont.h>
 #import <JavaScriptCore/JavaScriptCore.h>

diff --git a/ios/RCTTextInputComponentView+Markdown.h b/ios/RCTTextInputComponentView+Markdown.h
@@ -2,7 +2,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTTextInputComponentView.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/RCTTextInputComponentView+Markdown.mm b/ios/RCTTextInputComponentView+Markdown.mm
@@ -1,8 +1,8 @@
 // This guard prevent this file to be compiled in the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#import <react-native-live-markdown/RCTTextInputComponentView+Markdown.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTTextInputComponentView+Markdown.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 #import <React/RCTUITextField.h>
 #import <objc/message.h>
 

diff --git a/ios/RCTUITextView+Markdown.h b/ios/RCTUITextView+Markdown.h
@@ -1,6 +1,6 @@
 #import <UIKit/UIKit.h>
 #import <React/RCTUITextView.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ios/RCTUITextView+Markdown.mm b/ios/RCTUITextView+Markdown.mm
@@ -1,5 +1,5 @@
-#import <react-native-live-markdown/RCTUITextView+Markdown.h>
-#import <react-native-live-markdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/RCTUITextView+Markdown.h>
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
 #import <objc/message.h>
 
 @implementation RCTUITextView (Markdown)