diff --git a/Common/cpp/NativeModules/NativeReanimatedModule.cpp b/Common/cpp/NativeModules/NativeReanimatedModule.cpp index af507486d0f..e5a6aa8c5af 100644 --- a/Common/cpp/NativeModules/NativeReanimatedModule.cpp +++ b/Common/cpp/NativeModules/NativeReanimatedModule.cpp @@ -1,6 +1,4 @@ #include "NativeReanimatedModule.h" -#include "Logger.h" -#include "SpeedChecker.h" #include "ShareableValue.h" #include "MapperRegistry.h" #include "Mapper.h" diff --git a/Common/cpp/SharedItems/ShareableValue.cpp b/Common/cpp/SharedItems/ShareableValue.cpp index 4cd26d72342..ab8b639ce8d 100644 --- a/Common/cpp/SharedItems/ShareableValue.cpp +++ b/Common/cpp/SharedItems/ShareableValue.cpp @@ -1,7 +1,6 @@ #include "ShareableValue.h" #include "SharedParent.h" #include "NativeReanimatedModule.h" -#include "Logger.h" #include "MutableValue.h" #include "MutableValueSetterProxy.h" #include "RemoteObject.h" diff --git a/Common/cpp/Tools/RuntimeDecorator.cpp b/Common/cpp/Tools/RuntimeDecorator.cpp index d5b43540a86..ae75b2d81d8 100644 --- a/Common/cpp/Tools/RuntimeDecorator.cpp +++ b/Common/cpp/Tools/RuntimeDecorator.cpp @@ -1,5 +1,5 @@ #include "RuntimeDecorator.h" -#include "Logger.h" +#include "Common/cpp/hidden_headers/Logger.h" #include #include diff --git a/Common/cpp/headers/SharedItems/ShareableValue.h b/Common/cpp/headers/SharedItems/ShareableValue.h index d4fa081015c..b1bb2d586ff 100644 --- a/Common/cpp/headers/SharedItems/ShareableValue.h +++ b/Common/cpp/headers/SharedItems/ShareableValue.h @@ -2,7 +2,6 @@ #include "WorkletsCache.h" #include "SharedParent.h" -#include "Logger.h" #include "ValueWrapper.h" #include "HostFunctionHandler.h" #include "JSIStoreValueUser.h" diff --git a/Common/cpp/headers/SpecTools/Logger.h b/Common/cpp/hidden_headers/Logger.h similarity index 91% rename from Common/cpp/headers/SpecTools/Logger.h rename to Common/cpp/hidden_headers/Logger.h index 828ba65de46..d94826083dc 100644 --- a/Common/cpp/headers/SpecTools/Logger.h +++ b/Common/cpp/hidden_headers/Logger.h @@ -1,6 +1,6 @@ #pragma once -#include "LoggerInterface.h" +#include "./LoggerInterface.h" #include namespace reanimated diff --git a/Common/cpp/headers/SpecTools/LoggerInterface.h b/Common/cpp/hidden_headers/LoggerInterface.h similarity index 100% rename from Common/cpp/headers/SpecTools/LoggerInterface.h rename to Common/cpp/hidden_headers/LoggerInterface.h diff --git a/Common/cpp/headers/SpecTools/SpeedChecker.h b/Common/cpp/hidden_headers/SpeedChecker.h similarity index 95% rename from Common/cpp/headers/SpecTools/SpeedChecker.h rename to Common/cpp/hidden_headers/SpeedChecker.h index 406dd143575..447f5e781b9 100644 --- a/Common/cpp/headers/SpecTools/SpeedChecker.h +++ b/Common/cpp/hidden_headers/SpeedChecker.h @@ -2,7 +2,7 @@ #define CHECK_SPEED 0 -#include "Logger.h" +#include "./Logger.h" namespace reanimated { diff --git a/RNReanimated.podspec b/RNReanimated.podspec index 45b84d41b0e..6cdf6ac10ef 100644 --- a/RNReanimated.podspec +++ b/RNReanimated.podspec @@ -37,10 +37,15 @@ Pod::Spec.new do |s| s.platforms = { :ios => "9.0", :tvos => "9.0" } s.source = { :git => "https://github.com/software-mansion/react-native-reanimated.git", :tag => "#{s.version}" } - s.source_files = - "ios/**/*.{mm,h,m}", - "Common/cpp/**/*.cpp", - "Common/cpp/headers/**/*.h" + s.source_files = [ + "ios/**/*.{mm,h,m}", + "Common/cpp/**/*.cpp", + "Common/cpp/headers/**/*.h" + ] + + s.preserve_paths = [ + "Common/cpp/hidden_headers/**" + ] s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", diff --git a/ios/native/REAIOSLogger.h b/ios/native/REAIOSLogger.h index 02a65217263..65efe7402e6 100644 --- a/ios/native/REAIOSLogger.h +++ b/ios/native/REAIOSLogger.h @@ -1,6 +1,6 @@ #pragma once -#include "LoggerInterface.h" +#include "Common/cpp/hidden_headers/LoggerInterface.h" #include namespace reanimated { diff --git a/ios/native/REAIOSLogger.mm b/ios/native/REAIOSLogger.mm index 237a91af7c1..cbae3be7bcb 100644 --- a/ios/native/REAIOSLogger.mm +++ b/ios/native/REAIOSLogger.mm @@ -1,5 +1,5 @@ #include "REAIOSLogger.h" -#include "Logger.h" +#include "Common/cpp/hidden_headers/Logger.h" #import namespace reanimated {