From 63635920dc0a5c5af75e3d01e76754036cb1d366 Mon Sep 17 00:00:00 2001 From: Tomek Zawadzki Date: Mon, 5 Feb 2024 21:12:40 +0100 Subject: [PATCH] Fix missing headers on iOS when using static linkage (#150) --- ...ve-markdown.podspec => RNLiveMarkdown.podspec | 2 +- example/ios/Podfile.lock | 16 ++++++++-------- ios/MarkdownLayoutManager.h | 2 +- ios/MarkdownLayoutManager.mm | 2 +- ios/MarkdownTextInputDecoratorComponentView.mm | 6 +++--- ios/MarkdownTextInputDecoratorView.h | 2 +- ios/MarkdownTextInputDecoratorView.mm | 14 +++++++------- ios/MarkdownTextInputDecoratorViewManager.mm | 4 ++-- ios/RCTBackedTextFieldDelegateAdapter+Markdown.h | 2 +- ios/RCTBackedTextFieldDelegateAdapter+Markdown.m | 4 ++-- ios/RCTBaseTextInputView+Markdown.h | 2 +- ios/RCTBaseTextInputView+Markdown.m | 4 ++-- ios/RCTMarkdownStyle.mm | 4 ++-- ios/RCTMarkdownUtils.h | 2 +- ios/RCTMarkdownUtils.mm | 4 ++-- ios/RCTTextInputComponentView+Markdown.h | 2 +- ios/RCTTextInputComponentView+Markdown.mm | 4 ++-- ios/RCTUITextView+Markdown.h | 2 +- ios/RCTUITextView+Markdown.mm | 4 ++-- 19 files changed, 41 insertions(+), 41 deletions(-) rename react-native-live-markdown.podspec => RNLiveMarkdown.podspec (97%) diff --git a/react-native-live-markdown.podspec b/RNLiveMarkdown.podspec similarity index 97% rename from react-native-live-markdown.podspec rename to RNLiveMarkdown.podspec index ab67b029..56ed5a1a 100644 --- a/react-native-live-markdown.podspec +++ b/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 index ef33d93c..06ff1670 100644 --- 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 index fa0e9e33..29be3508 100644 --- a/ios/MarkdownLayoutManager.h +++ b/ios/MarkdownLayoutManager.h @@ -1,5 +1,5 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/MarkdownLayoutManager.mm b/ios/MarkdownLayoutManager.mm index 17362823..cee032c9 100644 --- a/ios/MarkdownLayoutManager.mm +++ b/ios/MarkdownLayoutManager.mm @@ -1,4 +1,4 @@ -#import +#import @implementation MarkdownLayoutManager diff --git a/ios/MarkdownTextInputDecoratorComponentView.mm b/ios/MarkdownTextInputDecoratorComponentView.mm index e3ba62e6..91d46656 100644 --- a/ios/MarkdownTextInputDecoratorComponentView.mm +++ b/ios/MarkdownTextInputDecoratorComponentView.mm @@ -3,9 +3,9 @@ #import #import -#import -#import -#import +#import +#import +#import #import "RCTFabricComponentsPlugins.h" diff --git a/ios/MarkdownTextInputDecoratorView.h b/ios/MarkdownTextInputDecoratorView.h index 7de9a1f4..198780f2 100644 --- a/ios/MarkdownTextInputDecoratorView.h +++ b/ios/MarkdownTextInputDecoratorView.h @@ -1,5 +1,5 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/MarkdownTextInputDecoratorView.mm b/ios/MarkdownTextInputDecoratorView.mm index af73a926..f94f5a9f 100644 --- a/ios/MarkdownTextInputDecoratorView.mm +++ b/ios/MarkdownTextInputDecoratorView.mm @@ -1,15 +1,15 @@ #import -#import +#import "react_native_assert.h" -#import -#import -#import -#import +#import +#import +#import +#import #ifdef RCT_NEW_ARCH_ENABLED -#import +#import #else -#import +#import #endif /* RCT_NEW_ARCH_ENABLED */ #import diff --git a/ios/MarkdownTextInputDecoratorViewManager.mm b/ios/MarkdownTextInputDecoratorViewManager.mm index 8efb04f9..d59f27b6 100644 --- a/ios/MarkdownTextInputDecoratorViewManager.mm +++ b/ios/MarkdownTextInputDecoratorViewManager.mm @@ -1,5 +1,5 @@ -#import -#import +#import +#import @implementation MarkdownTextInputDecoratorViewManager diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h index 7d6f6918..f8ddc1d2 100644 --- a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h +++ b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h @@ -1,5 +1,5 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.m b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.m index 75d49585..bb3423b6 100644 --- a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.m +++ b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.m @@ -1,5 +1,5 @@ -#import -#import +#import +#import #import #import diff --git a/ios/RCTBaseTextInputView+Markdown.h b/ios/RCTBaseTextInputView+Markdown.h index 329b1a22..982a41fa 100644 --- a/ios/RCTBaseTextInputView+Markdown.h +++ b/ios/RCTBaseTextInputView+Markdown.h @@ -1,5 +1,5 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/RCTBaseTextInputView+Markdown.m b/ios/RCTBaseTextInputView+Markdown.m index fd5f22db..ad254869 100644 --- a/ios/RCTBaseTextInputView+Markdown.m +++ b/ios/RCTBaseTextInputView+Markdown.m @@ -1,5 +1,5 @@ -#import -#import +#import +#import #import @implementation RCTBaseTextInputView (Markdown) diff --git a/ios/RCTMarkdownStyle.mm b/ios/RCTMarkdownStyle.mm index d8296ebe..65de42e7 100644 --- a/ios/RCTMarkdownStyle.mm +++ b/ios/RCTMarkdownStyle.mm @@ -1,9 +1,9 @@ -#import +#import #ifdef RCT_NEW_ARCH_ENABLED #import #else -#import +#import #endif /* RCT_NEW_ARCH_ENABLED */ @implementation RCTMarkdownStyle diff --git a/ios/RCTMarkdownUtils.h b/ios/RCTMarkdownUtils.h index 31257cbc..a39eb75c 100644 --- a/ios/RCTMarkdownUtils.h +++ b/ios/RCTMarkdownUtils.h @@ -1,5 +1,5 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/RCTMarkdownUtils.mm b/ios/RCTMarkdownUtils.mm index ef71cbca..06600099 100644 --- a/ios/RCTMarkdownUtils.mm +++ b/ios/RCTMarkdownUtils.mm @@ -1,5 +1,5 @@ -#import -#import +#import +#import "react_native_assert.h" #import #import #import diff --git a/ios/RCTTextInputComponentView+Markdown.h b/ios/RCTTextInputComponentView+Markdown.h index d9a5c882..32f8d237 100644 --- a/ios/RCTTextInputComponentView+Markdown.h +++ b/ios/RCTTextInputComponentView+Markdown.h @@ -2,7 +2,7 @@ #ifdef RCT_NEW_ARCH_ENABLED #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/RCTTextInputComponentView+Markdown.mm b/ios/RCTTextInputComponentView+Markdown.mm index c67b84b7..f729ce61 100644 --- 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 -#import +#import +#import #import #import diff --git a/ios/RCTUITextView+Markdown.h b/ios/RCTUITextView+Markdown.h index d036b0a6..f792140e 100644 --- a/ios/RCTUITextView+Markdown.h +++ b/ios/RCTUITextView+Markdown.h @@ -1,6 +1,6 @@ #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ios/RCTUITextView+Markdown.mm b/ios/RCTUITextView+Markdown.mm index f2a9a5bb..dd08b87b 100644 --- a/ios/RCTUITextView+Markdown.mm +++ b/ios/RCTUITextView+Markdown.mm @@ -1,5 +1,5 @@ -#import -#import +#import +#import #import @implementation RCTUITextView (Markdown)