Support folder-based .xcconfig references in XCConfigIntegrator #12811
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Wow. I just ran into this today. |
|
@zrajnai-shapr3d |
|
My fix is very similar: def self.set_target_xcconfig(pod_bundle, target, config)
file_ref = create_xcconfig_ref(pod_bundle, config)
path = file_ref.path
if config.base_configuration_reference
existing_path = config.base_configuration_reference.real_path
elsif config.base_configuration_reference_anchor && config.base_configuration_reference_relative_path
existing_path = Pathname.new(File.join(config.base_configuration_reference_anchor.path, config.base_configuration_reference_relative_path))
end
if existing_path && existing_path != file_ref.real_path
if existing_path.to_path.start_with?(pod_bundle.sandbox.root.to_path << '/')
config.base_configuration_reference = file_ref
elsif !xcconfig_includes_target_xcconfig?(existing_path, path)
unless existing_config_is_identical_to_pod_config?(existing_path, pod_bundle.xcconfig_path(config.name))
UI.warn 'CocoaPods did not set the base configuration of your ' \
'project because your project already has a custom ' \
'config set. In order for CocoaPods integration to work at ' \
'all, please either set the base configurations of the target ' \
"`#{target.name}` to `#{path}` or include the `#{path}` in your " \
"build configuration (#{UI.path(existing_path)})."
end
end
elsif config.base_configuration_reference.nil? || file_ref.nil?
config.base_configuration_reference = file_ref
end
endI also had to change |
|
The code looks clean. I think it would be better to use UI.warn as a single statement. I'll take this into account and make the changes accordingly. However, I still find it challenging to properly handle the path for xcconfig, especially when calculating the relative path. |
wogus3602
force-pushed
the
feature/support-folder-based-xcconfig
branch
from
8a98a88 to
00a18ca
Compare
wogus3602
force-pushed
the
feature/support-folder-based-xcconfig
branch
from
00a18ca to
667c201
Compare
zrajnai-shapr3d
approved these changes
May 15, 2025
|
@segiddins |
|
@orta |
|
Merge, please? |
|
Hi @javierjosefernandes , Thanks for your patience! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support folder-based .xcconfig references in XCConfigIntegrator
Problem
When an Xcode project uses a folder reference (blue folder) for its
.xcconfigfiles, CocoaPods’XCConfigIntegratoronly checks thebaseConfigurationReferenceand ignores thebase_configuration_reference_anchorandbase_configuration_reference_relative_path. As a result, runningpod installwill overwrite the user’s custom.xcconfigfile withPods-*.xcconfig, breaking custom build configurations.Related Properties
base_configuration_reference_anchor:PBXFileSystemSynchronizedRootGroup, representing a special attribute for folder references.XCConfigIntegrator.base_configuration_reference_relative_path:String, representing the relative path of the.xcconfigfile within the folder reference.Solution
We updated the
set_target_xcconfigmethod inXCConfigIntegratorto properly handle folder-based.xcconfigfiles.Improvements
Handling folder-based
.xcconfigfiles:base_configuration_reference_anchorandbase_configuration_reference_relative_pathto handle folder-based configuration files.Improved warning messages:
UI.warnto include folder reference and relative path information, making the issue clearer.Benefits
.xcconfigthrough folder references can retain their custom configurations..xcconfigbehavior remains unaffected.Known Issue
Currently, the
#{path}displayed inUI.warndoes not accurately represent the intended relative path. Calculating the relative path correctly for display purposes remains a challenge, requiring further improvements.Testing
.xcconfigsetups.pod installpreserves the correct base configuration in all scenarios.References
#12806