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
06c077f5
Commit
06c077f5
authored
Oct 08, 2014
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Resolver] Add rudimentary lockfile handling, equivalent to the old behavior
parent
55b27b45
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+1
-1
resolver.rb
lib/cocoapods/resolver.rb
+3
-1
master
spec/fixtures/spec-repos/master
+1
-1
resolver_spec.rb
spec/unit/resolver_spec.rb
+1
-1
No files found.
lib/cocoapods/installer/analyzer.rb
View file @
06c077f5
...
...
@@ -241,7 +241,7 @@ module Pod
locking_pods
=
result
.
podfile_state
.
unchanged
if
update_mode
==
:selected
# If selected Pods should been updated, filter them out of the list
locking_pods
=
locking_pods
.
select
{
|
pod
|
!
update
[
:pods
].
include?
(
pod
)
}
locking_pods
=
locking_pods
.
reject
{
|
pod
|
update
[
:pods
].
include?
(
pod
)
}
end
locking_pods
.
map
do
|
pod
|
lockfile
.
dependencies_to_lock_pod_named
(
pod
)
...
...
lib/cocoapods/resolver.rb
View file @
06c077f5
...
...
@@ -87,7 +87,9 @@ module Pod
@activated
=
::
Resolver
::
Resolver
.
new
(
self
,
self
).
resolve
(
@podfile
.
target_definition_list
.
map
(
&
:dependencies
).
flatten
,
::
Resolver
::
DependencyGraph
.
new
locked_dependencies
.
reduce
(
::
Resolver
::
DependencyGraph
.
new
)
do
|
graph
,
locked
|
graph
.
tap
{
|
g
|
g
.
add_root_vertex
(
locked
.
name
,
locked
)
}
end
)
specs_by_target
rescue
::
Resolver
::
ResolverError
=>
e
...
...
master
@
b6e1c242
Subproject commit b
0f4e85738f1f911e32e2914b39e9acdce7c7ed9
Subproject commit b
6e1c2429964b4e47b344958572930e15ffbbcea
spec/unit/resolver_spec.rb
View file @
06c077f5
...
...
@@ -228,7 +228,7 @@ SPEC CHECKSUMS:
COCOAPODS: 0.33.1
EOS
lockfile
=
Lockfile
.
new
(
YAMLHelper
.
load_string
(
lockfile_yaml
))
resolver
=
Resolver
.
new
(
config
.
sandbox
,
podfile
,
lockfile
.
dependencies
,
SourcesManager
.
all
)
resolver
=
Resolver
.
new
(
config
.
sandbox
,
podfile
,
lockfile
.
dependencies
,
SourcesManager
.
master
)
resolver
.
resolve
.
values
.
first
.
find
{
|
s
|
s
.
name
==
'Mixpanel'
}.
version
.
to_s
.
should
==
'2.5.1'
...
...
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