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
3e27274c
Unverified
Commit
3e27274c
authored
Jan 31, 2018
by
Samuel Giddins
Committed by
GitHub
Jan 31, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7385 from CocoaPods/seg-local-podspec-cleanup
[Sandbox] Clean up usage of #local?
parents
2b4de852
f3d6ae6e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
installer.rb
lib/cocoapods/installer.rb
+1
-1
pods_project_generator.rb
lib/cocoapods/installer/xcode/pods_project_generator.rb
+1
-1
sandbox.rb
lib/cocoapods/sandbox.rb
+1
-3
pods_project_generator_spec.rb
spec/unit/installer/xcode/pods_project_generator_spec.rb
+2
-2
No files found.
lib/cocoapods/installer.rb
View file @
3e27274c
...
...
@@ -651,7 +651,7 @@ module Pod
#
def
development_pod_targets
pod_targets
.
select
do
|
pod_target
|
sandbox
.
development_pods
.
keys
.
include
?
(
pod_target
.
pod_name
)
sandbox
.
local
?
(
pod_target
.
pod_name
)
end
end
...
...
lib/cocoapods/installer/xcode/pods_project_generator.rb
View file @
3e27274c
...
...
@@ -277,7 +277,7 @@ module Pod
#
def
development_pod_targets
pod_targets
.
select
do
|
pod_target
|
sandbox
.
development_pods
.
keys
.
include
?
(
pod_target
.
pod_name
)
sandbox
.
local
?
(
pod_target
.
pod_name
)
end
end
...
...
lib/cocoapods/sandbox.rb
View file @
3e27274c
...
...
@@ -389,9 +389,7 @@ module Pod
#
def
local_podspec
(
name
)
root_name
=
Specification
.
root_name
(
name
)
if
path
=
development_pods
[
root_name
]
Pathname
.
new
(
path
)
end
development_pods
[
root_name
]
end
#-------------------------------------------------------------------------#
...
...
spec/unit/installer/xcode/pods_project_generator_spec.rb
View file @
3e27274c
...
...
@@ -438,7 +438,7 @@ module Pod
pod_target
=
fixture_pod_target
(
spec
)
@generator
.
stubs
(
:pod_targets
).
returns
([
pod_target
])
@generator
.
sandbox
.
stubs
(
:development_pods
).
returns
(
'BananaLib'
=>
nil
)
@generator
.
sandbox
.
stubs
(
:development_pods
).
returns
(
'BananaLib'
=>
fixture
(
'BananaLib'
)
)
end
it
'does not share by default'
do
...
...
@@ -468,7 +468,7 @@ module Pod
returns
(
true
)
@generator
.
stubs
(
:pod_targets
).
returns
([
pod_target
])
@generator
.
sandbox
.
stubs
(
:development_pods
).
returns
(
'CoconutLib'
=>
nil
)
@generator
.
sandbox
.
stubs
(
:development_pods
).
returns
(
'CoconutLib'
=>
fixture
(
'CoconutLib'
)
)
Xcodeproj
::
XCScheme
.
expects
(
:share_scheme
).
with
(
@generator
.
project
.
path
,
...
...
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