Skip to content

Commit

Permalink
Resolve pod conflict (#1775)
Browse files Browse the repository at this point in the history
## Description

The problem very well described [here](CocoaPods/CocoaPods#9248) (Freeform description section)

## Possible solution
- turn off USE_HEADERMAPS
- move header file to `preserved_paths`
  • Loading branch information
piaskowyk authored Mar 2, 2021
1 parent 36a46ef commit 424bb2e
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 13 deletions.
2 changes: 0 additions & 2 deletions Common/cpp/NativeModules/NativeReanimatedModule.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#include "NativeReanimatedModule.h"
#include "Logger.h"
#include "SpeedChecker.h"
#include "ShareableValue.h"
#include "MapperRegistry.h"
#include "Mapper.h"
Expand Down
1 change: 0 additions & 1 deletion Common/cpp/SharedItems/ShareableValue.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Common/cpp/Tools/RuntimeDecorator.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "RuntimeDecorator.h"
#include "Logger.h"
#include "Common/cpp/hidden_headers/Logger.h"
#include <unordered_map>
#include <memory>

Expand Down
1 change: 0 additions & 1 deletion Common/cpp/headers/SharedItems/ShareableValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "WorkletsCache.h"
#include "SharedParent.h"
#include "Logger.h"
#include "ValueWrapper.h"
#include "HostFunctionHandler.h"
#include "JSIStoreValueUser.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "LoggerInterface.h"
#include "./LoggerInterface.h"
#include <memory>

namespace reanimated
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define CHECK_SPEED 0

#include "Logger.h"
#include "./Logger.h"

namespace reanimated
{
Expand Down
13 changes: 9 additions & 4 deletions RNReanimated.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ios/native/REAIOSLogger.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "LoggerInterface.h"
#include "Common/cpp/hidden_headers/LoggerInterface.h"
#include <stdio.h>

namespace reanimated {
Expand Down
2 changes: 1 addition & 1 deletion ios/native/REAIOSLogger.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "REAIOSLogger.h"
#include "Logger.h"
#include "Common/cpp/hidden_headers/Logger.h"
#import <Foundation/Foundation.h>

namespace reanimated {
Expand Down

0 comments on commit 424bb2e

Please sign in to comment.