Commit e9667506 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Gemfile] Use resolver branch of Core

Use new Dependency#prerelease? method
parent ed57f931
......@@ -12,7 +12,7 @@ gemspec
group :development do
cp_gem 'claide', 'CLAide'
cp_gem 'cocoapods-core', 'Core'
cp_gem 'cocoapods-core', 'Core', 'resolver'
cp_gem 'cocoapods-downloader', 'cocoapods-downloader'
cp_gem 'cocoapods-plugins', 'cocoapods-plugins'
cp_gem 'cocoapods-trunk', 'cocoapods-trunk'
......
......@@ -7,8 +7,8 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: 99748b5b9fa8fe6541218f1752c0379589c7a6ee
branch: master
revision: 78b395571a54d34ba9cb220349dc75b066e80cd1
branch: resolver
specs:
cocoapods-core (0.34.4)
activesupport (>= 3.2.15)
......
......@@ -107,15 +107,10 @@ module Pod
def search_for(dependency)
@search ||= {}
@search[dependency] ||= begin
prerelease_requirement = dependency.
requirement.
requirements.
any? { |r| Version.new(r[1].version).prerelease? }
find_cached_set(dependency).
all_specifications.
select { |s| dependency.requirement.satisfied_by? Version.new(s.version) }.
reject { |s| !prerelease_requirement && s.version.prerelease? }.
reject { |s| !dependency.prerelease? && s.version.prerelease? }.
reverse.
map { |s| s.subspec_by_name dependency.name rescue nil }.
compact.
......
Subproject commit b6e1c2429964b4e47b344958572930e15ffbbcea
Subproject commit b0f4e85738f1f911e32e2914b39e9acdce7c7ed9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment