Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
18808944
Commit
18808944
authored
Dec 29, 2015
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[XCConfigIntegrator] Fix detection of fixable other base config
parent
2cd8016b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
xcconfig_integrator.rb
...oject_integrator/target_integrator/xcconfig_integrator.rb
+2
-2
xcconfig_integrator_spec.rb
..._integrator/target_integrator/xcconfig_integrator_spec.rb
+12
-0
No files found.
lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
View file @
18808944
...
@@ -85,7 +85,7 @@ module Pod
...
@@ -85,7 +85,7 @@ module Pod
end
end
if
existing
&&
existing
!=
file_ref
if
existing
&&
existing
!=
file_ref
if
existing
.
real_path
.
to_path
.
start_with?
(
pod_bundle
.
s
upport_files_dir
.
to_path
)
if
existing
.
real_path
.
to_path
.
start_with?
(
pod_bundle
.
s
andbox
.
root
.
to_path
<<
'/'
)
set_base_configuration_reference
.
call
set_base_configuration_reference
.
call
elsif
!
xcconfig_includes_target_xcconfig?
(
config
.
base_configuration_reference
,
path
)
elsif
!
xcconfig_includes_target_xcconfig?
(
config
.
base_configuration_reference
,
path
)
UI
.
warn
'CocoaPods did not set the base configuration of your '
\
UI
.
warn
'CocoaPods did not set the base configuration of your '
\
...
@@ -93,7 +93,7 @@ module Pod
...
@@ -93,7 +93,7 @@ module Pod
'config set. In order for CocoaPods integration to work at '
\
'config set. In order for CocoaPods integration to work at '
\
'all, please either set the base configurations of the target '
\
'all, please either set the base configurations of the target '
\
"`
#{
target
.
name
}
` to `
#{
path
}
` or include the `
#{
path
}
` in your "
\
"`
#{
target
.
name
}
` to `
#{
path
}
` or include the `
#{
path
}
` in your "
\
'build configuration.'
"build configuration (
#{
UI
.
path
(
existing
.
real_path
)
}
)."
end
end
elsif
config
.
base_configuration_reference
.
nil?
||
file_ref
.
nil?
elsif
config
.
base_configuration_reference
.
nil?
||
file_ref
.
nil?
set_base_configuration_reference
.
call
set_base_configuration_reference
.
call
...
...
spec/unit/installer/user_project_integrator/target_integrator/xcconfig_integrator_spec.rb
View file @
18808944
...
@@ -107,6 +107,18 @@ module Pod
...
@@ -107,6 +107,18 @@ module Pod
it
'handles when xcconfig is set to another sandbox xcconfig'
do
it
'handles when xcconfig is set to another sandbox xcconfig'
do
group
=
@project
.
new_group
(
'Pods'
)
group
=
@project
.
new_group
(
'Pods'
)
old_config
=
group
.
new_file
(
'../Pods/Target Support Files/Pods-Foo/SampleConfig.xcconfig'
)
@target
.
build_configurations
.
each
do
|
config
|
config
.
base_configuration_reference
=
old_config
end
XCConfigIntegrator
.
integrate
(
@pod_bundle
,
[
@target
])
@target
.
build_configurations
.
each
do
|
config
|
config
.
base_configuration_reference
.
should
.
not
==
old_config
config
.
base_configuration_reference
.
path
.
should
==
@pod_bundle
.
xcconfig_relative_path
(
config
.
name
)
end
@pod_bundle
.
stubs
(
:label
).
returns
(
'Pods-Foo'
)
old_config
=
group
.
new_file
(
'../Pods/Target Support Files/Pods/SampleConfig.xcconfig'
)
old_config
=
group
.
new_file
(
'../Pods/Target Support Files/Pods/SampleConfig.xcconfig'
)
@target
.
build_configurations
.
each
do
|
config
|
@target
.
build_configurations
.
each
do
|
config
|
config
.
base_configuration_reference
=
old_config
config
.
base_configuration_reference
=
old_config
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment