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
3207c69f
Commit
3207c69f
authored
Apr 08, 2018
by
Jacek Suliga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the case for app extensions
parent
22071111
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
pods_project_generator.rb
lib/cocoapods/installer/xcode/pods_project_generator.rb
+13
-11
No files found.
lib/cocoapods/installer/xcode/pods_project_generator.rb
View file @
3207c69f
...
@@ -218,6 +218,7 @@ module Pod
...
@@ -218,6 +218,7 @@ module Pod
frameworks_group
=
project
.
frameworks_group
frameworks_group
=
project
.
frameworks_group
test_only_pod_targets
=
pod_targets
.
dup
test_only_pod_targets
=
pod_targets
.
dup
pod_targets_for_deps
=
Set
.
new
pod_targets_for_deps
=
Set
.
new
pod_extension_targets
=
Set
.
new
aggregate_targets
.
each
do
|
aggregate_target
|
aggregate_targets
.
each
do
|
aggregate_target
|
is_app_extension
=
!
(
aggregate_target
.
user_targets
.
map
(
&
:symbol_type
)
&
is_app_extension
=
!
(
aggregate_target
.
user_targets
.
map
(
&
:symbol_type
)
&
[
:app_extension
,
:watch_extension
,
:watch2_extension
,
:tv_extension
,
:messages_extension
]).
empty?
[
:app_extension
,
:watch_extension
,
:watch2_extension
,
:tv_extension
,
:messages_extension
]).
empty?
...
@@ -240,13 +241,18 @@ module Pod
...
@@ -240,13 +241,18 @@ module Pod
aggregate_target
.
native_target
.
add_dependency
(
pod_target
.
native_target
)
aggregate_target
.
native_target
.
add_dependency
(
pod_target
.
native_target
)
configure_app_extension_api_only_for_target
(
pod_target
)
if
is_app_extension
configure_app_extension_api_only_for_target
(
pod_target
)
if
is_app_extension
if
is_app_extension
pod_extension_targets
<<
pod_target
end
pod_targets_for_deps
<<
pod_target
pod_targets_for_deps
<<
pod_target
unless
pod_target
.
static_framework?
unless
pod_target
.
static_framework?
add_pod_target_test_dependencies
(
pod_target
,
frameworks_group
)
add_pod_target_test_dependencies
(
pod_target
,
frameworks_group
)
end
end
end
end
end
end
test_pod_targets_for_deps
=
Set
.
new
# Wire up remaining pod targets used only by tests and are not used by any aggregate target.
# Wire up remaining pod targets used only by tests and are not used by any aggregate target.
test_only_pod_targets
.
each
do
|
pod_target
|
test_only_pod_targets
.
each
do
|
pod_target
|
unless
pod_target
.
should_build?
unless
pod_target
.
should_build?
...
@@ -254,23 +260,19 @@ module Pod
...
@@ -254,23 +260,19 @@ module Pod
next
next
end
end
unless
pod_target
.
static_framework?
unless
pod_target
.
static_framework?
test_
pod_targets_for_deps
<<
pod_target
pod_targets_for_deps
<<
pod_target
add_pod_target_test_dependencies
(
pod_target
,
frameworks_group
)
add_pod_target_test_dependencies
(
pod_target
,
frameworks_group
)
end
end
end
end
# Actually add the dependent targets
# Actually add the dependent targets
pod_targets_for_deps
.
each
do
|
pod_target
|
pod_targets_for_deps
.
each
do
|
pod_target
|
is_app_extension
=
pod_extension_targets
.
include?
pod_target
add_dependent_targets_to_native_target
(
pod_target
.
dependent_targets
,
add_dependent_targets_to_native_target
(
pod_target
.
dependent_targets
,
pod_target
.
native_target
,
is_app_extension
,
pod_target
.
native_target
,
pod_target
.
requires_frameworks?
&&
!
pod_target
.
static_framework?
,
is_app_extension
,
frameworks_group
)
pod_target
.
requires_frameworks?
&&
!
pod_target
.
static_framework?
,
end
frameworks_group
)
test_pod_targets_for_deps
.
each
do
|
test_pod_target
|
add_dependent_targets_to_native_target
(
test_pod_target
.
dependent_targets
,
test_pod_target
.
native_target
,
false
,
test_pod_target
.
requires_frameworks?
,
frameworks_group
)
end
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