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
c06be7de
Commit
c06be7de
authored
Jul 03, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Ensure no duplicate target deps are created
parent
a9f5d195
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
5 deletions
+9
-5
CHANGELOG.md
CHANGELOG.md
+4
-0
Gemfile.lock
Gemfile.lock
+1
-1
installer.rb
lib/cocoapods/installer.rb
+1
-1
target_integrator.rb
...ds/installer/user_project_integrator/target_integrator.rb
+1
-1
pod_target.rb
lib/cocoapods/target/pod_target.rb
+2
-2
No files found.
CHANGELOG.md
View file @
c06be7de
...
...
@@ -42,6 +42,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#3537
](
https://github.com/CocoaPods/CocoaPods/issues/3537
)
*
Ensure that no duplicate framework or target dependencies are created.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#3763
](
https://github.com/CocoaPods/CocoaPods/issues/3763
)
## 0.38.0.beta.1
...
...
Gemfile.lock
View file @
c06be7de
...
...
@@ -24,7 +24,7 @@ GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision:
e5d74992284d75e25b3a19d02a943133852f0a9f
revision:
be12faf76853e46ca84767c890feda08415495db
branch: master
specs:
xcodeproj (0.26.0)
...
...
lib/cocoapods/installer.rb
View file @
c06be7de
...
...
@@ -626,7 +626,7 @@ module Pod
if
pod_target
.
requires_frameworks?
product_ref
=
frameworks_group
.
files
.
find
{
|
f
|
f
.
path
==
pod_dependency_target
.
product_name
}
||
frameworks_group
.
new_product_ref_for_target
(
pod_dependency_target
.
product_basename
,
pod_dependency_target
.
product_type
)
pod_target
.
native_target
.
frameworks_build_phase
.
add_file_reference
(
product_ref
)
pod_target
.
native_target
.
frameworks_build_phase
.
add_file_reference
(
product_ref
,
true
)
end
end
end
...
...
lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View file @
c06be7de
...
...
@@ -126,7 +126,7 @@ module Pod
new_product_ref
=
frameworks
.
files
.
find
{
|
f
|
f
.
path
==
target
.
product_name
}
||
frameworks
.
new_product_ref_for_target
(
target_basename
,
target
.
product_type
)
build_file
=
build_phase
.
build_file
(
new_product_ref
)
||
build_phase
.
add_file_reference
(
new_product_ref
)
build_phase
.
add_file_reference
(
new_product_ref
,
true
)
if
target
.
requires_frameworks?
# Weak link the aggregate target's product, because as it contains
# no symbols, it isn't copied into the app bundle. dyld will so
...
...
lib/cocoapods/target/pod_target.rb
View file @
c06be7de
...
...
@@ -153,9 +153,9 @@ module Pod
# depends.
#
def
dependencies
spec_consumers
.
map
do
|
consumer
|
spec_consumers
.
flat_
map
do
|
consumer
|
consumer
.
dependencies
.
map
{
|
dep
|
Specification
.
root_name
(
dep
.
name
)
}
end
.
flatten
end
.
uniq
end
# Checks if the target should be included in the build configuration with
...
...
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