Skip to content

Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NickGerleman wants to merge 1 commit into from
Closed

Testing: Remove private headers from podspecs #36993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
"$(PODS_ROOT)/RCT-Folly",
"${PODS_ROOT}/Headers/Public/FlipperKit",
"$(PODS_ROOT)/Headers/Public/ReactCommon",
"$(PODS_ROOT)/Headers/Public/React-RCTFabric"
"$(PODS_ROOT)/Headers/Public/React-RCTFabric",
"$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
"$(PODS_ROOT)/Headers/Public/React-hermes",
"$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
s.version = version
s.summary = "An utility library to simplify common operations for the New Architecture"
s.homepage = "https://reactnative.dev/"
s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
s.documentation_url = "https://reactnative.dev/"
s.license = package["license"]
s.author = "Meta Platforms, Inc. and its affiliates"
s.platforms = { :ios => min_ios_version_supported }
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/React/React-RCTFabric.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
"\"$(PODS_ROOT)/DoubleConversion\"",
"\"$(PODS_ROOT)/RCT-Folly\"",
"\"$(PODS_ROOT)/Headers/Private/React-Core\"",
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
"\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down
3 changes: 2 additions & 1 deletion packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
"\"$(PODS_ROOT)/boost\"",
"\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
"\"$(PODS_ROOT)/RCT-Folly\"",
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
]

if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
sss.exclude_files = "react/renderer/components/view/tests"
sss.header_dir = "react/renderer/components/view"

sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
end
end

Expand Down
11 changes: 8 additions & 3 deletions packages/react-native/ReactCommon/yoga/Yoga.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
spec.source_files = source_files

header_files = 'yoga/*.h'
header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
spec.public_header_files = header_files
public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
spec.public_header_files = public_header_files

# Fabric must be able to access private headers (which should not be included in the umbrella header)
all_header_files = 'yoga/**/*.h'
all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/BitUtils.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/CompactValue.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/Utils.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
const float ownerSize) {
return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/YGConfig.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
setCloneNodeCallback(YGCloneNodeFunc{nullptr});
}
};

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
return lhs < rhs || lhs == rhs;
}

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/YGLayout.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
bool operator==(YGLayout layout) const;
bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/YGNode.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
bool isNodeFlexible();
void reset();
};

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/YGStyle.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
return !(lhs == rhs);
}

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/yoga/yoga/log.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif
1 change: 1 addition & 0 deletions packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
"\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
"\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
].join(' ')
},
'dependencies': {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

# Assert
assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

# Assert
assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
assert_equal(
spec.dependencies,
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/scripts/cocoapods/codegen_utils.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
"\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
"\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
]
framework_search_paths = []

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/scripts/cocoapods/new_architecture.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

header_search_paths = ["\"$(PODS_ROOT)/boost\""]
header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
if ENV['USE_FRAMEWORKS']
header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down
24 changes: 24 additions & 0 deletions packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
DEVELOPMENT_TEAM = "";
HEADER_SEARCH_PATHS = (
"${PODS_ROOT}/Headers/Private/Yoga",
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
DEVELOPMENT_TEAM = "";
EXCLUDED_ARCHS = "";
HEADER_SEARCH_PATHS = (
"${PODS_ROOT}/Headers/Private/Yoga",
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
HEADER_SEARCH_PATHS = (
"${PODS_ROOT}/Headers/Private/Yoga",
"$(inherited)",
);
INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
HEADER_SEARCH_PATHS = (
"${PODS_ROOT}/Headers/Private/Yoga",
"$(inherited)",
);
INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
"FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
"$(inherited)",
);
HEADER_SEARCH_PATHS = (
"${PODS_ROOT}/Headers/Private/Yoga",
"$(inherited)",
);
INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
HEADER_SEARCH_PATHS = (
"${PODS_ROOT}/Headers/Private/Yoga",
"$(inherited)",
);
INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Testing: Remove private headers from podspecs by NickGerleman · Pull Request #36993 · react/react-native · GitHub
Skip to content
Testing: Remove private headers from podspecs#36993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Testing: Remove private headers from podspecs
#36993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,8 @@ header_search_paths = [
 "$(PODS_ROOT)/RCT-Folly",
 "${PODS_ROOT}/Headers/Public/FlipperKit",
 "$(PODS_ROOT)/Headers/Public/ReactCommon",
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
 "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
 "$(PODS_ROOT)/Headers/Private/Yoga",
].concat(use_hermes ? [
 "$(PODS_ROOT)/Headers/Public/React-hermes",
 "$(PODS_ROOT)/Headers/Public/hermes-engine"
Expand All@@ -54,7 +55,7 @@ Pod::Spec.new do |s|
 s.version = version
 s.summary = "An utility library to simplify common operations for the New Architecture"
 s.homepage = "https://reactnative.dev/"
 s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
 s.documentation_url = "https://reactnative.dev/"
 s.license = package["license"]
 s.author = "Meta Platforms, Inc. and its affiliates"
 s.platforms = { :ios => min_ios_version_supported }
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/React/React-RCTFabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ header_search_paths = [
 "\"$(PODS_ROOT)/DoubleConversion\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
 "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",

Expand Down

3 changes: 2 additions & 1 deletion
packages/react-native/ReactCommon/React-Fabric.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ Pod::Spec.new do |s|
 "\"$(PODS_ROOT)/boost\"",
 "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
 "\"$(PODS_ROOT)/RCT-Folly\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]

 if ENV['USE_FRAMEWORKS']
Expand DownExpand Up@@ -220,7 +221,7 @@ Pod::Spec.new do |s|
 sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
 sss.exclude_files = "react/renderer/components/view/tests"
 sss.header_dir = "react/renderer/components/view"

 sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
 end
 end

Expand Down

11 changes: 8 additions & 3 deletions
packages/react-native/ReactCommon/yoga/Yoga.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
 source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.source_files = source_files

 header_files = 'yoga/*.h'
 header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = header_files
 public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
 public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.public_header_files = public_header_files

 # Fabric must be able to access private headers (which should not be included in the umbrella header)
 all_header_files = 'yoga/**/*.h'
 all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
 spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
end

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/BitUtils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand DownExpand Up@@ -67,5 +65,3 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/CompactValue.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#if defined(__has_include) && __has_include(<version>)
// needed to be able to evaluate defined(__cpp_lib_bit_cast)
#include <version>
Expand DownExpand Up@@ -212,5 +210,3 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand DownExpand Up@@ -146,5 +144,3 @@ inline YGFloatOptional YGResolveValueMargin(
 const float ownerSize) {
 return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGConfig.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand DownExpand Up@@ -77,5 +75,3 @@ struct YOGA_EXPORT YGConfig {
 setCloneNodeCallback(YGCloneNodeFunc{nullptr});
 }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGFloatOptional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand DownExpand Up@@ -70,5 +68,3 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
 return lhs < rhs || lhs == rhs;
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGLayout.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand DownExpand Up@@ -63,5 +61,3 @@ struct YGLayout {
 bool operator==(YGLayout layout) const;
 bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <cstdint>
#include <stdio.h>
#include "CompactValue.h"
Expand DownExpand Up@@ -337,5 +335,3 @@ struct YOGA_EXPORT YGNode {
 bool isNodeFlexible();
 void reset();
};

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All@@ -28,5 +26,3 @@ void YGNodeToString(
} // namespace facebook

#endif

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/YGStyle.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cstdint>
Expand DownExpand Up@@ -237,5 +235,3 @@ YOGA_EXPORT bool operator==(const YGStyle& lhs, const YGStyle& rhs);
YOGA_EXPORT inline bool operator!=(const YGStyle& lhs, const YGStyle& rhs) {
 return !(lhs == rhs);
}

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand DownExpand Up@@ -154,5 +152,3 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/yoga/yoga/log.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,6 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand DownExpand Up@@ -38,5 +36,3 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -547,6 +547,7 @@ def get_podspec_no_fabric_no_script
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ].join(' ')
 },
 'dependencies': {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths

 # Assert
 assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
 assert_equal(
Expand DownExpand Up@@ -161,7 +161,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler

 # Assert
 assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"")
 assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
 assert_equal(
 spec.dependencies,
Expand Down

1 change: 1 addition & 0 deletions
packages/react-native/scripts/cocoapods/codegen_utils.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
 "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
 "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
 "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
 "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
 ]
 framework_search_paths = []

Expand Down

2 changes: 1 addition & 1 deletion
packages/react-native/scripts/cocoapods/new_architecture.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
 current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
 current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""

 header_search_paths = ["\"$(PODS_ROOT)/boost\""]
 header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
 if ENV['USE_FRAMEWORKS']
 header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
 header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
Expand Down

24 changes: 24 additions & 0 deletions
packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,6 +842,10 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -875,6 +879,10 @@
 CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 DEVELOPMENT_TEAM = "";
 EXCLUDED_ARCHS = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1084,6 +1092,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEBUG_INFORMATION_FORMAT = dwarf;
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1122,6 +1134,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterUnitTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1163,6 +1179,10 @@
 "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/RNTesterIntegrationTests/ReferenceImages\\\"\"",
 "$(inherited)",
 );
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand DownExpand Up@@ -1198,6 +1218,10 @@
 COPY_PHASE_STRIP = NO;
 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 DEVELOPMENT_TEAM = "";
 HEADER_SEARCH_PATHS = (
 "${PODS_ROOT}/Headers/Private/Yoga",
 "$(inherited)",
 );
 INFOPLIST_FILE = RNTesterIntegrationTests/Info.plist;
 IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 LD_RUNPATH_SEARCH_PATHS = (
Expand Down