diff --git a/ios/Brushes/RNSVGBaseBrush.m b/ios/Brushes/RNSVGBaseBrush.m index 2732fd52..5e587eb2 100644 --- a/ios/Brushes/RNSVGBaseBrush.m +++ b/ios/Brushes/RNSVGBaseBrush.m @@ -8,7 +8,7 @@ #import "RNSVGBaseBrush.h" #import "RCTConvert+RNSVG.h" -#import "RCTLog.h" +#import @implementation RNSVGBaseBrush diff --git a/ios/Brushes/RNSVGBrush.m b/ios/Brushes/RNSVGBrush.m index 10be584f..d99b4bfb 100644 --- a/ios/Brushes/RNSVGBrush.m +++ b/ios/Brushes/RNSVGBrush.m @@ -8,7 +8,7 @@ #import "RNSVGBrush.h" -#import "RCTDefines.h" +#import @implementation RNSVGBrush diff --git a/ios/Brushes/RNSVGPattern.m b/ios/Brushes/RNSVGPattern.m index 83676dcc..29cefdab 100644 --- a/ios/Brushes/RNSVGPattern.m +++ b/ios/Brushes/RNSVGPattern.m @@ -9,7 +9,7 @@ #import "RNSVGPattern.h" #import "RCTConvert+RNSVG.h" -#import "RCTLog.h" +#import @implementation RNSVGPattern { diff --git a/ios/Brushes/RNSVGSolidColorBrush.m b/ios/Brushes/RNSVGSolidColorBrush.m index 66607d9f..57a3f9c0 100644 --- a/ios/Brushes/RNSVGSolidColorBrush.m +++ b/ios/Brushes/RNSVGSolidColorBrush.m @@ -9,7 +9,7 @@ #import "RNSVGSolidColorBrush.h" #import "RCTConvert+RNSVG.h" -#import "RCTLog.h" +#import @implementation RNSVGSolidColorBrush { diff --git a/ios/Elements/RNSVGImage.m b/ios/Elements/RNSVGImage.m index f6587686..2ef97772 100644 --- a/ios/Elements/RNSVGImage.m +++ b/ios/Elements/RNSVGImage.m @@ -7,9 +7,9 @@ */ #import "RNSVGImage.h" -#import "RCTImageSource.h" #import "RCTConvert+RNSVG.h" -#import "RCTLog.h" +#import +#import #import "RNSVGViewBox.h" @implementation RNSVGImage diff --git a/ios/Elements/RNSVGSvgView.m b/ios/Elements/RNSVGSvgView.m index 4c2801f8..5dde5e81 100644 --- a/ios/Elements/RNSVGSvgView.m +++ b/ios/Elements/RNSVGSvgView.m @@ -9,7 +9,7 @@ #import "RNSVGSvgView.h" #import "RNSVGNode.h" -#import "RCTLog.h" +#import @implementation RNSVGSvgView { diff --git a/ios/Elements/RNSVGUse.m b/ios/Elements/RNSVGUse.m index e7237b87..fea9e7a7 100644 --- a/ios/Elements/RNSVGUse.m +++ b/ios/Elements/RNSVGUse.m @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. */ #import "RNSVGUse.h" -#import "RCTLog.h" +#import @implementation RNSVGUse diff --git a/ios/RNSVG.xcodeproj/project.pbxproj b/ios/RNSVG.xcodeproj/project.pbxproj index 920bfe9e..38003680 100644 --- a/ios/RNSVG.xcodeproj/project.pbxproj +++ b/ios/RNSVG.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../react-native/React/**", + "$(BUILT_PRODUCTS_DIR)/usr/local/include", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RNSVG; @@ -528,7 +528,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../react-native/React/**", + "$(BUILT_PRODUCTS_DIR)/usr/local/include", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RNSVG; diff --git a/ios/RNSVGNode.h b/ios/RNSVGNode.h index eec91939..e8adf1c8 100644 --- a/ios/RNSVGNode.h +++ b/ios/RNSVGNode.h @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "UIView+React.h" +#import #import "RNSVGCGFCRule.h" #import "RNSVGSvgView.h" diff --git a/ios/Shapes/RNSVGCircle.m b/ios/Shapes/RNSVGCircle.m index 0dec9f34..7a57d865 100644 --- a/ios/Shapes/RNSVGCircle.m +++ b/ios/Shapes/RNSVGCircle.m @@ -7,7 +7,7 @@ */ #import "RNSVGCircle.h" -#import "RCTLog.h" +#import @implementation RNSVGCircle diff --git a/ios/Shapes/RNSVGEllipse.m b/ios/Shapes/RNSVGEllipse.m index eda97bf0..f4a7a067 100644 --- a/ios/Shapes/RNSVGEllipse.m +++ b/ios/Shapes/RNSVGEllipse.m @@ -7,7 +7,7 @@ */ #import "RNSVGEllipse.h" -#import "RCTLog.h" +#import @implementation RNSVGEllipse diff --git a/ios/Shapes/RNSVGLine.m b/ios/Shapes/RNSVGLine.m index fb3f3751..0f936c1e 100644 --- a/ios/Shapes/RNSVGLine.m +++ b/ios/Shapes/RNSVGLine.m @@ -7,7 +7,7 @@ */ #import "RNSVGLine.h" -#import "RCTLog.h" +#import @implementation RNSVGLine diff --git a/ios/Shapes/RNSVGRect.m b/ios/Shapes/RNSVGRect.m index 233b78e5..452b03ff 100644 --- a/ios/Shapes/RNSVGRect.m +++ b/ios/Shapes/RNSVGRect.m @@ -7,7 +7,7 @@ */ #import "RNSVGRect.h" -#import "RCTLog.h" +#import @implementation RNSVGRect diff --git a/ios/Utils/RCTConvert+RNSVG.h b/ios/Utils/RCTConvert+RNSVG.h index 5dc78a95..a5dc77dc 100644 --- a/ios/Utils/RCTConvert+RNSVG.h +++ b/ios/Utils/RCTConvert+RNSVG.h @@ -10,7 +10,7 @@ #import "RCTConvert+RNSVG.h" #import "RNSVGCGFloatArray.h" #import "RNSVGTextFrame.h" -#import "RCTConvert.h" +#import #import "RNSVGCGFCRule.h" @class RNSVGBrush; diff --git a/ios/Utils/RCTConvert+RNSVG.m b/ios/Utils/RCTConvert+RNSVG.m index 6a4b2236..b44923a1 100644 --- a/ios/Utils/RCTConvert+RNSVG.m +++ b/ios/Utils/RCTConvert+RNSVG.m @@ -11,10 +11,10 @@ #import "RNSVGBaseBrush.h" #import "RNSVGPattern.h" #import "RNSVGSolidColorBrush.h" -#import "RCTLog.h" +#import #import "RNSVGCGFCRule.h" #import "RNSVGVBMOS.h" -#import "RCTFont.h" +#import @implementation RCTConvert (RNSVG) diff --git a/ios/ViewManagers/RNSVGDefsManager.h b/ios/ViewManagers/RNSVGDefsManager.h index 6c2d232c..591ba680 100644 --- a/ios/ViewManagers/RNSVGDefsManager.h +++ b/ios/ViewManagers/RNSVGDefsManager.h @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTViewManager.h" +#import @interface RNSVGDefsManager : RCTViewManager diff --git a/ios/ViewManagers/RNSVGNodeManager.h b/ios/ViewManagers/RNSVGNodeManager.h index c7282306..2075bf61 100644 --- a/ios/ViewManagers/RNSVGNodeManager.h +++ b/ios/ViewManagers/RNSVGNodeManager.h @@ -7,7 +7,7 @@ */ #import "RNSVGNode.h" -#import "RCTViewManager.h" +#import @interface RNSVGNodeManager : RCTViewManager diff --git a/ios/ViewManagers/RNSVGSvgViewManager.h b/ios/ViewManagers/RNSVGSvgViewManager.h index 700c8eb9..adbb6645 100644 --- a/ios/ViewManagers/RNSVGSvgViewManager.h +++ b/ios/ViewManagers/RNSVGSvgViewManager.h @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTViewManager.h" +#import @interface RNSVGSvgViewManager : RCTViewManager diff --git a/ios/ViewManagers/RNSVGSvgViewManager.m b/ios/ViewManagers/RNSVGSvgViewManager.m index 774e81a8..b606d3bd 100644 --- a/ios/ViewManagers/RNSVGSvgViewManager.m +++ b/ios/ViewManagers/RNSVGSvgViewManager.m @@ -6,8 +6,8 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBridge.h" -#import "RCTUIManager.h" +#import +#import #import "RNSVGSvgViewManager.h" #import "RNSVGSvgView.h"