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
533f4ce0
Unverified
Commit
533f4ce0
authored
Apr 03, 2018
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodsProjectGenerator] Add target dependencies when inheriting search paths
parent
36151737
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
0 deletions
+18
-0
CHANGELOG.md
CHANGELOG.md
+3
-0
pods_project_generator.rb
lib/cocoapods/installer/xcode/pods_project_generator.rb
+4
-0
pods_project_generator_spec.rb
spec/unit/installer/xcode/pods_project_generator_spec.rb
+11
-0
No files found.
CHANGELOG.md
View file @
533f4ce0
...
@@ -19,6 +19,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -19,6 +19,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Fix building Swift static library test specs.
*
Fix building Swift static library test specs.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
*
Swift static libraries can be used in targets whose search paths are inherited.
[
Samuel Giddins
](
https://github.com/segiddins
)
## 1.5.0.beta.1 (2018-03-23)
## 1.5.0.beta.1 (2018-03-23)
##### Enhancements
##### Enhancements
...
...
lib/cocoapods/installer/xcode/pods_project_generator.rb
View file @
533f4ce0
...
@@ -223,6 +223,10 @@ module Pod
...
@@ -223,6 +223,10 @@ module Pod
[
:app_extension
,
:watch_extension
,
:watch2_extension
,
:tv_extension
,
:messages_extension
]).
empty?
[
:app_extension
,
:watch_extension
,
:watch2_extension
,
:tv_extension
,
:messages_extension
]).
empty?
is_app_extension
||=
aggregate_target
.
user_targets
.
any?
{
|
ut
|
ut
.
common_resolved_build_setting
(
'APPLICATION_EXTENSION_API_ONLY'
)
==
'YES'
}
is_app_extension
||=
aggregate_target
.
user_targets
.
any?
{
|
ut
|
ut
.
common_resolved_build_setting
(
'APPLICATION_EXTENSION_API_ONLY'
)
==
'YES'
}
aggregate_target
.
search_paths_aggregate_targets
.
each
do
|
search_paths_target
|
aggregate_target
.
native_target
.
add_dependency
(
search_paths_target
.
native_target
)
end
aggregate_target
.
pod_targets
.
each
do
|
pod_target
|
aggregate_target
.
pod_targets
.
each
do
|
pod_target
|
test_only_pod_targets
.
delete
(
pod_target
)
test_only_pod_targets
.
delete
(
pod_target
)
configure_app_extension_api_only_for_target
(
aggregate_target
)
if
is_app_extension
configure_app_extension_api_only_for_target
(
aggregate_target
)
if
is_app_extension
...
...
spec/unit/installer/xcode/pods_project_generator_spec.rb
View file @
533f4ce0
...
@@ -202,6 +202,17 @@ module Pod
...
@@ -202,6 +202,17 @@ module Pod
@generator
.
send
(
:set_target_dependencies
)
@generator
.
send
(
:set_target_dependencies
)
end
end
it
'adds target dependencies when inheriting search paths'
do
native_target
=
mock
(
'SearchPathsAggregateNativeTarget'
)
@target
.
stubs
(
:search_paths_aggregate_targets
).
returns
([
mock
(
'SearchPathsAggregateTarget'
,
:native_target
=>
native_target
),
])
@mock_target
.
expects
(
:add_dependency
).
with
(
native_target
)
@generator
.
send
(
:set_target_dependencies
)
end
it
'configures APPLICATION_EXTENSION_API_ONLY for app extension targets'
do
it
'configures APPLICATION_EXTENSION_API_ONLY for app extension targets'
do
test_extension_target
(
:app_extension
)
test_extension_target
(
:app_extension
)
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