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
95bfe7b1
Commit
95bfe7b1
authored
Jun 01, 2015
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Fix sharing schemes with deduplication
parent
46a17cce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
10 deletions
+18
-10
installer.rb
lib/cocoapods/installer.rb
+15
-6
installer_spec.rb
spec/unit/installer_spec.rb
+3
-4
No files found.
lib/cocoapods/installer.rb
View file @
95bfe7b1
...
@@ -628,12 +628,8 @@ module Pod
...
@@ -628,12 +628,8 @@ module Pod
# @return [void]
# @return [void]
#
#
def
share_development_pod_schemes
def
share_development_pod_schemes
development_pod_targets
=
sandbox
.
development_pods
.
keys
.
map
do
|
pod
|
development_pod_targets
.
select
(
&
:should_build?
).
each
do
|
pod_target
|
pods_project
.
targets
.
select
{
|
target
|
target
.
name
=~
/^Pods-.*-
#{
pod
}
$/
}
Xcodeproj
::
XCScheme
.
share_scheme
(
pods_project
.
path
,
pod_target
.
label
)
end
.
flatten
development_pod_targets
.
each
do
|
pod_target
|
Xcodeproj
::
XCScheme
.
share_scheme
(
pods_project
.
path
,
pod_target
.
name
)
end
end
end
end
...
@@ -740,6 +736,19 @@ module Pod
...
@@ -740,6 +736,19 @@ module Pod
#-------------------------------------------------------------------------#
#-------------------------------------------------------------------------#
public
# @return [Array<Library>] The targets of the development pods generated by
# the installation process.
#
def
development_pod_targets
pod_targets
.
select
do
|
pod_target
|
sandbox
.
development_pods
.
keys
.
include?
(
pod_target
.
pod_name
)
end
end
#-------------------------------------------------------------------------#
private
private
# @!group Private helpers
# @!group Private helpers
...
...
spec/unit/installer_spec.rb
View file @
95bfe7b1
...
@@ -619,15 +619,14 @@ module Pod
...
@@ -619,15 +619,14 @@ module Pod
it
'shares schemes of development pods'
do
it
'shares schemes of development pods'
do
spec
=
fixture_spec
(
'banana-lib/BananaLib.podspec'
)
spec
=
fixture_spec
(
'banana-lib/BananaLib.podspec'
)
target_definition
=
Podfile
::
TargetDefinition
.
new
(
:default
,
@installer
.
podfile
)
pod_target
=
fixture_pod_target
(
spec
)
pod_target
=
PodTarget
.
new
([
spec
],
[
target_definition
],
config
.
sandbox
)
@installer
.
pods_project
.
stubs
(
:
targets
).
returns
([
pod_target
])
@installer
.
stubs
(
:pod_
targets
).
returns
([
pod_target
])
@installer
.
sandbox
.
stubs
(
:development_pods
).
returns
(
'BananaLib'
=>
nil
)
@installer
.
sandbox
.
stubs
(
:development_pods
).
returns
(
'BananaLib'
=>
nil
)
Xcodeproj
::
XCScheme
.
expects
(
:share_scheme
).
with
(
Xcodeproj
::
XCScheme
.
expects
(
:share_scheme
).
with
(
@installer
.
pods_project
.
path
,
@installer
.
pods_project
.
path
,
'
Pods-default-
BananaLib'
)
'BananaLib'
)
@installer
.
send
(
:share_development_pod_schemes
)
@installer
.
send
(
:share_development_pod_schemes
)
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