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
fbe58121
Commit
fbe58121
authored
Jul 26, 2014
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Handle build configuration case insensitively
parent
e0e98e51
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
installer.rb
lib/cocoapods/installer.rb
+3
-3
target_integrator.rb
...ds/installer/user_project_integrator/target_integrator.rb
+0
-1
installer_spec.rb
spec/unit/installer_spec.rb
+2
-2
No files found.
lib/cocoapods/installer.rb
View file @
fbe58121
...
...
@@ -96,7 +96,7 @@ module Pod
def
resolve_dependencies
UI
.
section
"Analyzing dependencies"
do
analyze
validate_
whiteliste
d_configurations
validate_
buil
d_configurations
prepare_for_legacy_compatibility
clean_sandbox
end
...
...
@@ -183,11 +183,11 @@ module Pod
#
# @raise If a unknown user configuration is found.
#
def
validate_
whiteliste
d_configurations
def
validate_
buil
d_configurations
whitelisted_configs
=
pod_targets
.
map
do
|
target
|
target
.
target_definition
.
all_whitelisted_configurations
end
.
flatten
.
uniq
all_user_configurations
=
analysis_result
.
all_user_build_configurations
.
keys
all_user_configurations
=
analysis_result
.
all_user_build_configurations
.
keys
.
map
(
&
:downcase
)
remainder
=
whitelisted_configs
-
all_user_configurations
unless
remainder
.
empty?
...
...
lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View file @
fbe58121
...
...
@@ -112,7 +112,6 @@ module Pod
native_target
.
build_configurations
.
each
do
|
config
|
path
=
target
.
xcconfig_relative_path
(
config
.
name
)
xcconfig
=
user_project
.
files
.
select
{
|
f
|
f
.
path
==
path
}.
first
||
user_project
.
new_file
(
path
)
check_overridden_build_settings
(
target
.
xcconfigs
[
config
.
name
],
native_target
)
config
.
base_configuration_reference
=
xcconfig
end
...
...
spec/unit/installer_spec.rb
View file @
fbe58121
...
...
@@ -154,7 +154,7 @@ module Pod
target_definition
.
whitelist_pod_for_configuration
(
'JSONKit'
,
'YOLO'
)
@installer
.
send
(
:analyze
)
should
.
raise
Informative
do
@installer
.
send
(
:validate_
whiteliste
d_configurations
)
@installer
.
send
(
:validate_
buil
d_configurations
)
end
end
...
...
@@ -163,7 +163,7 @@ module Pod
target_definition
.
whitelist_pod_for_configuration
(
'JSONKit'
,
'Test'
)
@installer
.
send
(
:analyze
)
should
.
not
.
raise
do
@installer
.
send
(
:validate_
whiteliste
d_configurations
)
@installer
.
send
(
:validate_
buil
d_configurations
)
end
end
end
...
...
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