diff --git a/.eslintignore b/.eslintignore index f868bfeb..45ef798e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,7 +3,7 @@ parser/react-native-live-markdown-parser.js # any js file inside android and ios folders **/android/**/*.js -**/ios/**/*.js +**/apple/**/*.js # Output of the build process & scripts lib/**/* diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 41158c7b..2b820cc8 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -4,7 +4,7 @@ on: paths: - .github/workflows/build-ios.yml - RNLiveMarkdown.podspec - - ios/** + - apple/** - cpp/** - example/package.json - example/ios/** @@ -17,7 +17,7 @@ on: paths: - .github/workflows/build-ios.yml - RNLiveMarkdown.podspec - - ios/** + - apple/** - cpp/** - example/package.json - example/ios/** diff --git a/RNLiveMarkdown.podspec b/RNLiveMarkdown.podspec index a7f13894..c70a0608 100644 --- a/RNLiveMarkdown.podspec +++ b/RNLiveMarkdown.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.platforms = { :ios => "11.0", :visionos => "1.0" } s.source = { :git => "https://github.com/expensify/react-native-live-markdown.git", :tag => "#{s.version}" } - s.source_files = "ios/**/*.{h,m,mm}" + s.source_files = "apple/**/*.{h,m,mm}" s.resources = "parser/react-native-live-markdown-parser.js" diff --git a/ios/MarkdownCommitHook.h b/apple/MarkdownCommitHook.h similarity index 100% rename from ios/MarkdownCommitHook.h rename to apple/MarkdownCommitHook.h diff --git a/ios/MarkdownCommitHook.mm b/apple/MarkdownCommitHook.mm similarity index 100% rename from ios/MarkdownCommitHook.mm rename to apple/MarkdownCommitHook.mm diff --git a/ios/MarkdownLayoutManager.h b/apple/MarkdownLayoutManager.h similarity index 100% rename from ios/MarkdownLayoutManager.h rename to apple/MarkdownLayoutManager.h diff --git a/ios/MarkdownLayoutManager.mm b/apple/MarkdownLayoutManager.mm similarity index 100% rename from ios/MarkdownLayoutManager.mm rename to apple/MarkdownLayoutManager.mm diff --git a/ios/MarkdownTextInputDecoratorComponentView.h b/apple/MarkdownTextInputDecoratorComponentView.h similarity index 100% rename from ios/MarkdownTextInputDecoratorComponentView.h rename to apple/MarkdownTextInputDecoratorComponentView.h diff --git a/ios/MarkdownTextInputDecoratorComponentView.mm b/apple/MarkdownTextInputDecoratorComponentView.mm similarity index 100% rename from ios/MarkdownTextInputDecoratorComponentView.mm rename to apple/MarkdownTextInputDecoratorComponentView.mm diff --git a/ios/MarkdownTextInputDecoratorView.h b/apple/MarkdownTextInputDecoratorView.h similarity index 100% rename from ios/MarkdownTextInputDecoratorView.h rename to apple/MarkdownTextInputDecoratorView.h diff --git a/ios/MarkdownTextInputDecoratorView.mm b/apple/MarkdownTextInputDecoratorView.mm similarity index 100% rename from ios/MarkdownTextInputDecoratorView.mm rename to apple/MarkdownTextInputDecoratorView.mm diff --git a/ios/MarkdownTextInputDecoratorViewManager.h b/apple/MarkdownTextInputDecoratorViewManager.h similarity index 100% rename from ios/MarkdownTextInputDecoratorViewManager.h rename to apple/MarkdownTextInputDecoratorViewManager.h diff --git a/ios/MarkdownTextInputDecoratorViewManager.mm b/apple/MarkdownTextInputDecoratorViewManager.mm similarity index 100% rename from ios/MarkdownTextInputDecoratorViewManager.mm rename to apple/MarkdownTextInputDecoratorViewManager.mm diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h b/apple/RCTBackedTextFieldDelegateAdapter+Markdown.h similarity index 100% rename from ios/RCTBackedTextFieldDelegateAdapter+Markdown.h rename to apple/RCTBackedTextFieldDelegateAdapter+Markdown.h diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.mm b/apple/RCTBackedTextFieldDelegateAdapter+Markdown.mm similarity index 100% rename from ios/RCTBackedTextFieldDelegateAdapter+Markdown.mm rename to apple/RCTBackedTextFieldDelegateAdapter+Markdown.mm diff --git a/ios/RCTBaseTextInputView+Markdown.h b/apple/RCTBaseTextInputView+Markdown.h similarity index 100% rename from ios/RCTBaseTextInputView+Markdown.h rename to apple/RCTBaseTextInputView+Markdown.h diff --git a/ios/RCTBaseTextInputView+Markdown.mm b/apple/RCTBaseTextInputView+Markdown.mm similarity index 100% rename from ios/RCTBaseTextInputView+Markdown.mm rename to apple/RCTBaseTextInputView+Markdown.mm diff --git a/ios/RCTLiveMarkdownModule.h b/apple/RCTLiveMarkdownModule.h similarity index 100% rename from ios/RCTLiveMarkdownModule.h rename to apple/RCTLiveMarkdownModule.h diff --git a/ios/RCTLiveMarkdownModule.mm b/apple/RCTLiveMarkdownModule.mm similarity index 100% rename from ios/RCTLiveMarkdownModule.mm rename to apple/RCTLiveMarkdownModule.mm diff --git a/ios/RCTMarkdownStyle.h b/apple/RCTMarkdownStyle.h similarity index 100% rename from ios/RCTMarkdownStyle.h rename to apple/RCTMarkdownStyle.h diff --git a/ios/RCTMarkdownStyle.mm b/apple/RCTMarkdownStyle.mm similarity index 100% rename from ios/RCTMarkdownStyle.mm rename to apple/RCTMarkdownStyle.mm diff --git a/ios/RCTMarkdownUtils.h b/apple/RCTMarkdownUtils.h similarity index 100% rename from ios/RCTMarkdownUtils.h rename to apple/RCTMarkdownUtils.h diff --git a/ios/RCTMarkdownUtils.mm b/apple/RCTMarkdownUtils.mm similarity index 100% rename from ios/RCTMarkdownUtils.mm rename to apple/RCTMarkdownUtils.mm diff --git a/ios/RCTTextInputComponentView+Markdown.h b/apple/RCTTextInputComponentView+Markdown.h similarity index 100% rename from ios/RCTTextInputComponentView+Markdown.h rename to apple/RCTTextInputComponentView+Markdown.h diff --git a/ios/RCTTextInputComponentView+Markdown.mm b/apple/RCTTextInputComponentView+Markdown.mm similarity index 100% rename from ios/RCTTextInputComponentView+Markdown.mm rename to apple/RCTTextInputComponentView+Markdown.mm diff --git a/ios/RCTUITextView+Markdown.h b/apple/RCTUITextView+Markdown.h similarity index 100% rename from ios/RCTUITextView+Markdown.h rename to apple/RCTUITextView+Markdown.h diff --git a/ios/RCTUITextView+Markdown.mm b/apple/RCTUITextView+Markdown.mm similarity index 100% rename from ios/RCTUITextView+Markdown.mm rename to apple/RCTUITextView+Markdown.mm diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 075622ea..14c774cb 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1497,7 +1497,7 @@ PODS: - React-logger (= 0.75.2) - React-perflogger (= 0.75.2) - React-utils (= 0.75.2) - - RNLiveMarkdown (0.1.168): + - RNLiveMarkdown (0.1.169): - DoubleConversion - glog - hermes-engine @@ -1517,9 +1517,9 @@ PODS: - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNLiveMarkdown/newarch (= 0.1.168) + - RNLiveMarkdown/newarch (= 0.1.169) - Yoga - - RNLiveMarkdown/newarch (0.1.168): + - RNLiveMarkdown/newarch (0.1.169): - DoubleConversion - glog - hermes-engine @@ -1805,7 +1805,7 @@ SPEC CHECKSUMS: React-utils: 81a715d9c0a2a49047e77a86f3a2247408540deb ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b - RNLiveMarkdown: 91b821469b0140201f9642d0a48a964f6dd61d13 + RNLiveMarkdown: 00ab78496be2ae15a15a83f14ba732c01624f02c SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: 2a45d7e59592db061217551fd3bbe2dd993817ae diff --git a/package.json b/package.json index 56636db5..924bdf52 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,11 @@ "lib", "parser/react-native-live-markdown-parser.js", "android", - "ios", + "apple", "cpp", "*.podspec", "react-native.config.js", - "!ios/build", + "!apple/build", "!android/build", "!android/gradle", "!android/gradlew",