From 0e09d6f8a665357f0dc642067eceb8f51ae24b76 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Wed, 15 Feb 2023 04:17:06 -0800 Subject: [PATCH] Move files from `.../textlayoutmanager/platform/ios` to `.../textlayoutmanager/platform/ios/react/renderer/textlayoutmanager` (#36158) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/36158 To properly setup the Header Search Paths for `use_frameworks!`, we need to move the files that are in the `.../textlayoutmanager/platform/ios` folder into the `.../textlayoutmanager/platform/ios/react/renderer/textlayoutmanager` folder. This mimic the same folder structure we have also `android` ## Changelog [iOS][Changed] Moved the files from `.../textlayoutmanager/platform/ios` to `.../textlayoutmanager/platform/ios/react/renderer/textlayoutmanager` Reviewed By: cortinico Differential Revision: D43088586 fbshipit-source-id: 9589fe62f36fbff2744fdfbf3475e95954424232 --- ReactCommon/react/renderer/textlayoutmanager/BUCK | 6 ++++-- .../renderer/textlayoutmanager}/NSTextStorage+FontScaling.h | 0 .../renderer/textlayoutmanager}/NSTextStorage+FontScaling.m | 0 .../renderer/textlayoutmanager}/RCTAttributedTextUtils.h | 0 .../renderer/textlayoutmanager}/RCTAttributedTextUtils.mm | 0 .../renderer/textlayoutmanager}/RCTFontProperties.h | 0 .../{ => react/renderer/textlayoutmanager}/RCTFontUtils.h | 0 .../{ => react/renderer/textlayoutmanager}/RCTFontUtils.mm | 0 .../renderer/textlayoutmanager}/RCTTextLayoutManager.h | 0 .../renderer/textlayoutmanager}/RCTTextLayoutManager.mm | 0 .../textlayoutmanager}/RCTTextPrimitivesConversions.h | 0 .../renderer/textlayoutmanager}/TextLayoutManager.h | 0 .../renderer/textlayoutmanager}/TextLayoutManager.mm | 0 13 files changed, 4 insertions(+), 2 deletions(-) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/NSTextStorage+FontScaling.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/NSTextStorage+FontScaling.m (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTAttributedTextUtils.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTAttributedTextUtils.mm (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTFontProperties.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTFontUtils.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTFontUtils.mm (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTTextLayoutManager.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTTextLayoutManager.mm (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/RCTTextPrimitivesConversions.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/TextLayoutManager.h (100%) rename ReactCommon/react/renderer/textlayoutmanager/platform/ios/{ => react/renderer/textlayoutmanager}/TextLayoutManager.mm (100%) diff --git a/ReactCommon/react/renderer/textlayoutmanager/BUCK b/ReactCommon/react/renderer/textlayoutmanager/BUCK index c4e3be0d401ac9..11657d056ca837 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/BUCK +++ b/ReactCommon/react/renderer/textlayoutmanager/BUCK @@ -14,6 +14,8 @@ load( "subdir_glob", ) +oncall("react_native") + APPLE_COMPILER_FLAGS = get_apple_compiler_flags() rn_xplat_cxx_library( @@ -83,7 +85,7 @@ rn_xplat_cxx_library( ], ios_exported_headers = subdir_glob( [ - ("platform/ios", "*.h"), + ("platform/ios/react/renderer/textlayoutmanager", "*.h"), ], prefix = "react/renderer/textlayoutmanager", ), @@ -94,7 +96,7 @@ rn_xplat_cxx_library( ], ios_headers = subdir_glob( [ - ("platform/ios", "**/*.h"), + ("platform/ios/react/renderer/textlayoutmanager", "**/*.h"), ], prefix = "", ), diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/NSTextStorage+FontScaling.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/NSTextStorage+FontScaling.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/NSTextStorage+FontScaling.m similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/NSTextStorage+FontScaling.m diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontProperties.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontProperties.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.mm similarity index 100% rename from ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.mm