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
320548b7
Commit
320548b7
authored
Oct 03, 2014
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[XCConfigIntegrator] Update descriptions to be more verbose
Thanks @alloy!
parent
b8320501
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
xcconfig_integrator.rb
...oject_integrator/target_integrator/xcconfig_integrator.rb
+6
-4
xcconfig_integrator_spec.rb
..._integrator/target_integrator/xcconfig_integrator_spec.rb
+2
-2
No files found.
lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
View file @
320548b7
...
@@ -78,10 +78,12 @@ module Pod
...
@@ -78,10 +78,12 @@ module Pod
group
=
config
.
project
[
'Pods'
]
||
config
.
project
.
new_group
(
'Pods'
)
group
=
config
.
project
[
'Pods'
]
||
config
.
project
.
new_group
(
'Pods'
)
file_ref
=
group
.
files
.
find
{
|
f
|
f
.
path
==
path
}
file_ref
=
group
.
files
.
find
{
|
f
|
f
.
path
==
path
}
if
config
.
base_configuration_reference
!=
file_ref
if
config
.
base_configuration_reference
!=
file_ref
UI
.
warn
"CocoaPods did not set the base configuration of your "
\
UI
.
warn
'CocoaPods did not set the base configuration of your '
\
"project because one is already set. Please either set the "
\
'project because because your project already has a custom '
\
"base configurations of the target `
#{
target
.
name
}
` to "
\
'config set. In order for CocoaPods integration to work at '
\
"`
#{
path
}
` or include the `
#{
path
}
` in your build configuration."
'all, please either set the base configurations of the target '
\
"
#{
target
.
name
}
` to `
#{
path
}
` or include the `
#{
path
}
` in your "
\
'build configuration.'
else
else
file_ref
||=
group
.
new_file
(
path
)
file_ref
||=
group
.
new_file
(
path
)
config
.
base_configuration_reference
=
file_ref
config
.
base_configuration_reference
=
file_ref
...
...
spec/unit/installer/user_project_integrator/target_integrator/xcconfig_integrator_spec.rb
View file @
320548b7
...
@@ -48,8 +48,8 @@ module Pod
...
@@ -48,8 +48,8 @@ module Pod
config
.
base_configuration_reference
.
should
.
equal
existing
config
.
base_configuration_reference
.
should
.
equal
existing
end
end
it
'does not set the Pods xcconfig as the base config if the
base
'
\
it
'does not set the Pods xcconfig as the base config if the
user
'
\
'
config is already set
'
do
'
has already set a config of their own
'
do
sample_config
=
@project
.
new_file
(
'SampleConfig.xcconfig'
)
sample_config
=
@project
.
new_file
(
'SampleConfig.xcconfig'
)
@target
.
build_configurations
.
each
do
|
config
|
@target
.
build_configurations
.
each
do
|
config
|
config
.
base_configuration_reference
=
sample_config
config
.
base_configuration_reference
=
sample_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