From 8b6e3b5ad7f6cebb9d7b357c85f823534ef6aff7 Mon Sep 17 00:00:00 2001 From: Josh Kaplan Date: Tue, 24 Jan 2023 10:45:06 -0800 Subject: [PATCH 1/2] Use modern Podfile syntax to avoid polluting application build settings Example warning ``` Can't merge user_target_xcconfig for pod targets: ["RNReanimated", "hermes-engine"]. Singular build setting CLANG_CXX_LANGUAGE_STANDARD has different values. ``` Background: > The former attribute xcconfig is deprecated and will cause a linter error when pushing new versions to trunk. The new attributes are available as pod_target_xcconfig and user_target_xcconfig, which makes their effects more clear. The latter attribute (user_target_xcconfig) should be used with great care, because well designed Pods should be self-contained and make as few assumptions about their environment as possible. Furthermore, this attribute can cause conflicts when different values are specified by two Pods for a build setting which doesn't allow multiple values and so cannot be merged. - https://blog.cocoapods.org/CocoaPods-0.38/ --- hermes-engine.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hermes-engine.podspec b/hermes-engine.podspec index 440edd97b0e..78ef74f16f7 100644 --- a/hermes-engine.podspec +++ b/hermes-engine.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |spec| spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework" spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework" - spec.xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "CLANG_CXX_LIBRARY" => "compiler-default", "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } + spec.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "CLANG_CXX_LIBRARY" => "compiler-default", "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } unless ENV['hermes-artifact-url'] spec.prepare_command = <<-EOS From 6e9a3f251cdfc7db21c20dfd900aaf8d57dfe18f Mon Sep 17 00:00:00 2001 From: Josh Kaplan Date: Tue, 24 Jan 2023 14:44:50 -0800 Subject: [PATCH 2/2] Enable hermes debugger in apple platform test --- .../ApplePlatformsIntegrationTests.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ApplePlatformsIntegrationTestApp/ApplePlatformsIntegrationTests.xcodeproj/project.pbxproj b/test/ApplePlatformsIntegrationTestApp/ApplePlatformsIntegrationTests.xcodeproj/project.pbxproj index f2ecac5cc61..01f855eb92e 100644 --- a/test/ApplePlatformsIntegrationTestApp/ApplePlatformsIntegrationTests.xcodeproj/project.pbxproj +++ b/test/ApplePlatformsIntegrationTestApp/ApplePlatformsIntegrationTests.xcodeproj/project.pbxproj @@ -431,6 +431,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", + "HERMES_ENABLE_DEBUGGER=1", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;