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
8ea6d951
Unverified
Commit
8ea6d951
authored
Jun 08, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodTarget] Allow non-deduped targets to be frameworks
parent
d897a3da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
pod_target.rb
lib/cocoapods/target/pod_target.rb
+1
-0
analyzer_spec.rb
spec/unit/installer/analyzer_spec.rb
+31
-0
No files found.
lib/cocoapods/target/pod_target.rb
View file @
8ea6d951
...
@@ -65,6 +65,7 @@ module Pod
...
@@ -65,6 +65,7 @@ module Pod
target
.
native_target
=
native_target
target
.
native_target
=
native_target
target
.
archs
=
archs
target
.
archs
=
archs
target
.
dependent_targets
=
dependent_targets
.
flat_map
{
|
pt
|
pt
.
scoped
(
cache
)
}.
select
{
|
pt
|
pt
.
target_definitions
==
[
target_definition
]
}
target
.
dependent_targets
=
dependent_targets
.
flat_map
{
|
pt
|
pt
.
scoped
(
cache
)
}.
select
{
|
pt
|
pt
.
target_definitions
==
[
target_definition
]
}
target
.
host_requires_frameworks
=
host_requires_frameworks
cache
[
cache_key
]
=
target
cache
[
cache_key
]
=
target
end
end
end
end
...
...
spec/unit/installer/analyzer_spec.rb
View file @
8ea6d951
...
@@ -332,6 +332,37 @@ module Pod
...
@@ -332,6 +332,37 @@ module Pod
Pods-SampleProject/monkey-Pods-SampleProject
Pods-SampleProject/monkey-Pods-SampleProject
)
.
sort
)
.
sort
end
end
it
"doesn't deduplicate targets when deduplication is disabled and using frameworks"
do
podfile
=
Pod
::
Podfile
.
new
do
install!
'cocoapods'
,
:deduplicate_targets
=>
false
source
SpecHelper
.
test_repo_url
platform
:ios
,
'6.0'
project
'SampleProject/SampleProject'
use_frameworks!
pod
'BananaLib'
target
'SampleProject'
do
target
'TestRunner'
do
pod
'BananaLib'
end
end
end
analyzer
=
Pod
::
Installer
::
Analyzer
.
new
(
config
.
sandbox
,
podfile
)
result
=
analyzer
.
analyze
result
.
targets
.
flat_map
{
|
at
|
at
.
pod_targets
.
map
{
|
pt
|
"
#{
at
.
name
}
/
#{
pt
.
name
}
"
}
}.
sort
.
should
==
%w(
Pods-SampleProject-TestRunner/BananaLib-Pods-SampleProject-TestRunner
Pods-SampleProject-TestRunner/monkey-Pods-SampleProject-TestRunner
Pods-SampleProject/BananaLib-Pods-SampleProject
Pods-SampleProject/monkey-Pods-SampleProject
)
.
sort
result
.
targets
.
flat_map
{
|
at
|
at
.
pod_targets
.
map
(
&
:requires_frameworks?
)
}.
uniq
.
should
==
[
true
]
end
end
end
it
'generates the integration library appropriately if the installation will not integrate'
do
it
'generates the integration library appropriately if the installation will not integrate'
do
...
...
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