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
4bdeac7e
Commit
4bdeac7e
authored
Jan 29, 2016
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Let the Analyzer determine the product type
parent
139c2ea0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
19 deletions
+2
-19
installer.rb
lib/cocoapods/installer.rb
+0
-17
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+1
-0
validator.rb
lib/cocoapods/validator.rb
+1
-1
installer_spec.rb
spec/unit/installer_spec.rb
+0
-1
No files found.
lib/cocoapods/installer.rb
View file @
4bdeac7e
...
@@ -108,7 +108,6 @@ module Pod
...
@@ -108,7 +108,6 @@ module Pod
prepare
prepare
resolve_dependencies
resolve_dependencies
download_dependencies
download_dependencies
determine_dependency_product_types
verify_no_duplicate_framework_names
verify_no_duplicate_framework_names
verify_no_static_framework_transitive_dependencies
verify_no_static_framework_transitive_dependencies
verify_framework_usage
verify_framework_usage
...
@@ -376,22 +375,6 @@ module Pod
...
@@ -376,22 +375,6 @@ module Pod
end
end
end
end
# Determines if the dependencies need to be built as dynamic frameworks or
# if they can be built as static libraries by checking for the Swift source
# presence. Therefore it is important that the file accessors of the
# #pod_targets are created.
#
# @return [void]
#
def
determine_dependency_product_types
aggregate_targets
.
each
do
|
aggregate_target
|
aggregate_target
.
pod_targets
.
each
do
|
pod_target
|
pod_target
.
host_requires_frameworks
||=
aggregate_target
.
requires_frameworks?
pod_target
.
platform
=
nil
# needs to be recomputed
end
end
end
def
verify_no_duplicate_framework_names
def
verify_no_duplicate_framework_names
aggregate_targets
.
each
do
|
aggregate_target
|
aggregate_targets
.
each
do
|
aggregate_target
|
aggregate_target
.
user_build_configurations
.
keys
.
each
do
|
config
|
aggregate_target
.
user_build_configurations
.
keys
.
each
do
|
config
|
...
...
lib/cocoapods/installer/analyzer.rb
View file @
4bdeac7e
...
@@ -415,6 +415,7 @@ module Pod
...
@@ -415,6 +415,7 @@ module Pod
#
#
def
generate_pod_target
(
target_definitions
,
pod_specs
,
scope_suffix:
nil
)
def
generate_pod_target
(
target_definitions
,
pod_specs
,
scope_suffix:
nil
)
pod_target
=
PodTarget
.
new
(
pod_specs
,
target_definitions
,
sandbox
,
scope_suffix
)
pod_target
=
PodTarget
.
new
(
pod_specs
,
target_definitions
,
sandbox
,
scope_suffix
)
pod_target
.
host_requires_frameworks
=
target_definitions
.
any?
(
&
:uses_frameworks?
)
if
installation_options
.
integrate_targets?
if
installation_options
.
integrate_targets?
target_inspections
=
result
.
target_inspections
.
select
{
|
t
,
_
|
target_definitions
.
include?
(
t
)
}.
values
target_inspections
=
result
.
target_inspections
.
select
{
|
t
,
_
|
target_definitions
.
include?
(
t
)
}.
values
...
...
lib/cocoapods/validator.rb
View file @
4bdeac7e
...
@@ -428,7 +428,7 @@ module Pod
...
@@ -428,7 +428,7 @@ module Pod
# for all available platforms with xcodebuild.
# for all available platforms with xcodebuild.
#
#
def
install_pod
def
install_pod
%i(
determine_dependency_product_types
verify_no_duplicate_framework_names
%i(verify_no_duplicate_framework_names
verify_no_static_framework_transitive_dependencies
verify_no_static_framework_transitive_dependencies
verify_framework_usage generate_pods_project integrate_user_project
verify_framework_usage generate_pods_project integrate_user_project
perform_post_install_actions)
.
each
{
|
m
|
@installer
.
send
(
m
)
}
perform_post_install_actions)
.
each
{
|
m
|
@installer
.
send
(
m
)
}
...
...
spec/unit/installer_spec.rb
View file @
4bdeac7e
...
@@ -61,7 +61,6 @@ module Pod
...
@@ -61,7 +61,6 @@ module Pod
before
do
before
do
@installer
.
stubs
(
:resolve_dependencies
)
@installer
.
stubs
(
:resolve_dependencies
)
@installer
.
stubs
(
:download_dependencies
)
@installer
.
stubs
(
:download_dependencies
)
@installer
.
stubs
(
:determine_dependency_product_types
)
@installer
.
stubs
(
:verify_no_duplicate_framework_names
)
@installer
.
stubs
(
:verify_no_duplicate_framework_names
)
@installer
.
stubs
(
:verify_no_static_framework_transitive_dependencies
)
@installer
.
stubs
(
:verify_no_static_framework_transitive_dependencies
)
@installer
.
stubs
(
:verify_framework_usage
)
@installer
.
stubs
(
:verify_framework_usage
)
...
...
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