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
e7ee802b
Commit
e7ee802b
authored
Nov 18, 2014
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Allow checkout options to be used for :head pods"
This reverts commit f6b8193c1285b55a04be8b72cefe404488b700c4.
parent
77d30006
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
17 deletions
+6
-17
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+0
-10
pod_source_installer.rb
lib/cocoapods/installer/pod_source_installer.rb
+2
-2
resolver.rb
lib/cocoapods/resolver.rb
+4
-5
No files found.
lib/cocoapods/installer/analyzer.rb
View file @
e7ee802b
...
...
@@ -53,8 +53,6 @@ module Pod
@result
.
podfile_state
=
generate_podfile_state
@locked_dependencies
=
generate_version_locking_dependencies
store_existing_checkout_options
fetch_external_sources
if
allow_fetches
@result
.
specs_by_target
=
resolve_dependencies
@result
.
specifications
=
generate_specifications
...
...
@@ -337,14 +335,6 @@ module Pod
end
end
def
store_existing_checkout_options
podfile
.
dependencies
.
select
{
|
d
|
d
.
external_source
||
d
.
head?
}.
each
do
|
dep
|
if
checkout_options
=
lockfile
&&
lockfile
.
checkout_options_for_pod_named
(
dep
.
root_name
)
sandbox
.
store_checkout_source
(
dep
.
root_name
,
checkout_options
)
end
end
end
# Converts the Podfile in a list of specifications grouped by target.
#
# @note As some dependencies might have external sources the resolver
...
...
lib/cocoapods/installer/pod_source_installer.rb
View file @
e7ee802b
...
...
@@ -81,7 +81,7 @@ module Pod
#
def
download_source
root
.
rmtree
if
root
.
exist?
if
head_pod?
&&
!
sandbox
.
checkout_sources
[
root_spec
.
name
]
if
head_pod?
begin
downloader
.
download_head
@specific_source
=
downloader
.
checkout_options
...
...
@@ -148,7 +148,7 @@ module Pod
# source.
#
def
downloader
@downloader
||=
Downloader
.
for_target
(
root
,
sandbox
.
checkout_sources
[
root_spec
.
name
]
||
root_spec
.
source
.
dup
)
@downloader
||=
Downloader
.
for_target
(
root
,
root_spec
.
source
.
dup
)
end
#-----------------------------------------------------------------------#
...
...
lib/cocoapods/resolver.rb
View file @
e7ee802b
...
...
@@ -302,10 +302,7 @@ module Pod
def
find_cached_set
(
dependency
)
name
=
dependency
.
root_name
unless
cached_sets
[
name
]
if
dependency
.
head?
spec
=
create_set_from_sources
(
dependency
).
specification
set
=
Specification
::
Set
::
Head
.
new
(
spec
)
elsif
dependency
.
external_source
if
dependency
.
external_source
spec
=
sandbox
.
specification
(
name
)
unless
spec
raise
StandardError
,
'[Bug] Unable to find the specification '
\
...
...
@@ -315,7 +312,9 @@ module Pod
else
set
=
create_set_from_sources
(
dependency
)
end
if
dependency
.
head?
set
=
Specification
::
Set
::
Head
.
new
(
set
.
specification
)
end
cached_sets
[
name
]
=
set
unless
set
raise
Molinillo
::
NoSuchDependencyError
.
new
(
dependency
)
# rubocop:disable Style/RaiseArgs
...
...
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