Update dependencies so that a new enough mochilo is used

In the gemspec, limit the mochilo version to something no older than
1.3 (brianmario/mochilo#20) for the 1.x series, and no older than 2.1
(brianmario/mochilo#19) for the 2.x series.

In the main Gemfile and in the v2 CI gemfile, bundle from github.com
because there hasn't been a gem cut yet.

In the v1 CI gemfile, bundle from the PR branch.
This commit is contained in:
Matt Burke 2017-06-06 16:08:36 -04:00
Родитель c4a1f2ca03
Коммит 10bb1e3203
4 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -4,4 +4,4 @@ source "https://rubygems.org"
gemspec
gem "mochilo", :git => "https://github.com/spraints/mochilo", :ref => "symbols-and-regexps-and-time-oh-my"
gem "mochilo", :git => "https://github.com/brianmario/mochilo", :ref => "master"

Просмотреть файл

@ -1,15 +1,15 @@
GIT
remote: https://github.com/spraints/mochilo
revision: 73fcaa99f01c42ad6017b201b0aeeca5f25a7a53
ref: symbols-and-regexps-and-time-oh-my
remote: https://github.com/brianmario/mochilo
revision: 8c75eea34bdde298733432b988c8d7f07f56e311
ref: master
specs:
mochilo (2.0)
mochilo (2.1)
PATH
remote: .
specs:
bert (1.1.10)
mochilo
mochilo (>= 1.3, != 2.0)
GEM
remote: https://rubygems.org/

Просмотреть файл

@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.extensions = ["ext/bert/c/extconf.rb"]
s.add_dependency "mochilo"
s.add_dependency "mochilo", ">= 1.3", "!= 2.0"
s.add_development_dependency "thoughtbot-shoulda"
s.add_development_dependency "git"

Просмотреть файл

@ -4,4 +4,4 @@ source "https://rubygems.org"
gemspec
gem "mochilo", :git => "https://github.com/spraints/mochilo", :ref => "symbols-and-regexps-and-time-oh-my"
gem "mochilo", :git => "https://github.com/brianmario/mochilo", :ref => "master"