From 8f0f649d2d47101299f595b6f450d0260376b813 Mon Sep 17 00:00:00 2001 From: Tomek Zawadzki Date: Fri, 26 Aug 2022 14:41:18 +0200 Subject: [PATCH] Use angle-bracket imports (#1848) This PR replaces bad double-quotes imports (which break Swift interop) with good angle-bracket imports. --- apple/Elements/RNSVGClipPath.mm | 4 ++-- apple/Elements/RNSVGDefs.mm | 4 ++-- apple/Elements/RNSVGForeignObject.mm | 4 ++-- apple/Elements/RNSVGGroup.mm | 4 ++-- apple/Elements/RNSVGImage.mm | 10 +++++----- apple/Elements/RNSVGLinearGradient.mm | 4 ++-- apple/Elements/RNSVGMarker.mm | 4 ++-- apple/Elements/RNSVGMask.mm | 4 ++-- apple/Elements/RNSVGPath.mm | 4 ++-- apple/Elements/RNSVGPattern.mm | 4 ++-- apple/Elements/RNSVGRadialGradient.mm | 4 ++-- apple/Elements/RNSVGSvgView.mm | 4 ++-- apple/Elements/RNSVGSymbol.mm | 4 ++-- apple/Elements/RNSVGUse.mm | 4 ++-- apple/Shapes/RNSVGCircle.mm | 4 ++-- apple/Shapes/RNSVGEllipse.mm | 4 ++-- apple/Shapes/RNSVGLine.mm | 4 ++-- apple/Shapes/RNSVGRect.mm | 4 ++-- apple/Text/RNSVGTSpan.mm | 4 ++-- apple/Text/RNSVGText.mm | 4 ++-- apple/Text/RNSVGTextPath.mm | 4 ++-- apple/Utils/RNSVGFabricConversions.h | 4 ++-- 22 files changed, 47 insertions(+), 47 deletions(-) diff --git a/apple/Elements/RNSVGClipPath.mm b/apple/Elements/RNSVGClipPath.mm index d2f4543d..07c67313 100644 --- a/apple/Elements/RNSVGClipPath.mm +++ b/apple/Elements/RNSVGClipPath.mm @@ -9,10 +9,10 @@ #import "RNSVGClipPath.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGDefs.mm b/apple/Elements/RNSVGDefs.mm index 9c88b035..6692ae4a 100644 --- a/apple/Elements/RNSVGDefs.mm +++ b/apple/Elements/RNSVGDefs.mm @@ -8,10 +8,10 @@ #import "RNSVGDefs.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGForeignObject.mm b/apple/Elements/RNSVGForeignObject.mm index 5e5b2ad8..9a958092 100644 --- a/apple/Elements/RNSVGForeignObject.mm +++ b/apple/Elements/RNSVGForeignObject.mm @@ -11,10 +11,10 @@ #import "RNSVGNode.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGGroup.mm b/apple/Elements/RNSVGGroup.mm index aaaafa81..5afb43c2 100644 --- a/apple/Elements/RNSVGGroup.mm +++ b/apple/Elements/RNSVGGroup.mm @@ -11,10 +11,10 @@ #import "RNSVGMask.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGImage.mm b/apple/Elements/RNSVGImage.mm index af151543..d02ff0cc 100644 --- a/apple/Elements/RNSVGImage.mm +++ b/apple/Elements/RNSVGImage.mm @@ -22,17 +22,17 @@ #endif // RN_FABRIC_ENABLED +#import #import -#import "RCTBridge.h" #import "RNSVGViewBox.h" #ifdef RN_FABRIC_ENABLED +#import +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" -#import "RCTImagePrimitivesConversions.h" -#import "RCTImageSource.h" +#import #import "RNSVGFabricConversions.h" // Some RN private method hacking below similar to how it is done in RNScreens: diff --git a/apple/Elements/RNSVGLinearGradient.mm b/apple/Elements/RNSVGLinearGradient.mm index 88b166ce..01315068 100644 --- a/apple/Elements/RNSVGLinearGradient.mm +++ b/apple/Elements/RNSVGLinearGradient.mm @@ -10,10 +10,10 @@ #import "RNSVGPainter.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGMarker.mm b/apple/Elements/RNSVGMarker.mm index d76d5660..8fa4ff0e 100644 --- a/apple/Elements/RNSVGMarker.mm +++ b/apple/Elements/RNSVGMarker.mm @@ -12,10 +12,10 @@ #import "RNSVGViewBox.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGMask.mm b/apple/Elements/RNSVGMask.mm index 2cebb1fc..1c0defa5 100644 --- a/apple/Elements/RNSVGMask.mm +++ b/apple/Elements/RNSVGMask.mm @@ -11,10 +11,10 @@ #import "RNSVGPainter.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGPath.mm b/apple/Elements/RNSVGPath.mm index 3dceee0a..fbe8a6e7 100644 --- a/apple/Elements/RNSVGPath.mm +++ b/apple/Elements/RNSVGPath.mm @@ -9,10 +9,10 @@ #import "RNSVGPath.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGPattern.mm b/apple/Elements/RNSVGPattern.mm index ccc39306..bd3e4ee8 100644 --- a/apple/Elements/RNSVGPattern.mm +++ b/apple/Elements/RNSVGPattern.mm @@ -11,10 +11,10 @@ #import "RNSVGPainter.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGRadialGradient.mm b/apple/Elements/RNSVGRadialGradient.mm index 4edf1559..f4eca2ff 100644 --- a/apple/Elements/RNSVGRadialGradient.mm +++ b/apple/Elements/RNSVGRadialGradient.mm @@ -8,10 +8,10 @@ #import "RNSVGRadialGradient.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGSvgView.mm b/apple/Elements/RNSVGSvgView.mm index 49d46133..7089f8ba 100644 --- a/apple/Elements/RNSVGSvgView.mm +++ b/apple/Elements/RNSVGSvgView.mm @@ -12,10 +12,10 @@ #import "RNSVGViewBox.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGSymbol.mm b/apple/Elements/RNSVGSymbol.mm index 577faeab..182f8ad8 100644 --- a/apple/Elements/RNSVGSymbol.mm +++ b/apple/Elements/RNSVGSymbol.mm @@ -9,10 +9,10 @@ #import "RNSVGViewBox.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Elements/RNSVGUse.mm b/apple/Elements/RNSVGUse.mm index 6aeb84ed..08a4de79 100644 --- a/apple/Elements/RNSVGUse.mm +++ b/apple/Elements/RNSVGUse.mm @@ -10,10 +10,10 @@ #import "RNSVGSymbol.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Shapes/RNSVGCircle.mm b/apple/Shapes/RNSVGCircle.mm index 4ce5b236..39a0ed46 100644 --- a/apple/Shapes/RNSVGCircle.mm +++ b/apple/Shapes/RNSVGCircle.mm @@ -10,10 +10,10 @@ #import #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Shapes/RNSVGEllipse.mm b/apple/Shapes/RNSVGEllipse.mm index a9b22bf7..245ba42a 100644 --- a/apple/Shapes/RNSVGEllipse.mm +++ b/apple/Shapes/RNSVGEllipse.mm @@ -10,10 +10,10 @@ #import #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Shapes/RNSVGLine.mm b/apple/Shapes/RNSVGLine.mm index 03886f64..3a2cc691 100644 --- a/apple/Shapes/RNSVGLine.mm +++ b/apple/Shapes/RNSVGLine.mm @@ -10,10 +10,10 @@ #import #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Shapes/RNSVGRect.mm b/apple/Shapes/RNSVGRect.mm index 4a6dc02d..1db35f43 100644 --- a/apple/Shapes/RNSVGRect.mm +++ b/apple/Shapes/RNSVGRect.mm @@ -10,10 +10,10 @@ #import #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Text/RNSVGTSpan.mm b/apple/Text/RNSVGTSpan.mm index 206f91c8..aefca6cd 100644 --- a/apple/Text/RNSVGTSpan.mm +++ b/apple/Text/RNSVGTSpan.mm @@ -18,10 +18,10 @@ static NSCharacterSet *RNSVGTSpan_separators = nil; static CGFloat RNSVGTSpan_radToDeg = 180 / (CGFloat)M_PI; #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Text/RNSVGText.mm b/apple/Text/RNSVGText.mm index 0530aba2..642bd504 100644 --- a/apple/Text/RNSVGText.mm +++ b/apple/Text/RNSVGText.mm @@ -14,10 +14,10 @@ #import "RNSVGTextProperties.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Text/RNSVGTextPath.mm b/apple/Text/RNSVGTextPath.mm index 0dfbc855..7c789f71 100644 --- a/apple/Text/RNSVGTextPath.mm +++ b/apple/Text/RNSVGTextPath.mm @@ -9,10 +9,10 @@ #import "RNSVGTextPath.h" #ifdef RN_FABRIC_ENABLED +#import +#import #import #import -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" #import "RNSVGFabricConversions.h" #endif // RN_FABRIC_ENABLED diff --git a/apple/Utils/RNSVGFabricConversions.h b/apple/Utils/RNSVGFabricConversions.h index 966cde98..bd22104b 100644 --- a/apple/Utils/RNSVGFabricConversions.h +++ b/apple/Utils/RNSVGFabricConversions.h @@ -6,8 +6,8 @@ #import "RNSVGSolidColorBrush.h" #import "RNSVGVBMOS.h" -#import "RCTConversions.h" -#import "RCTFabricComponentsPlugins.h" +#import +#import template RNSVGBrush *brushFromColorStruct(T fillObject)