From ebe9b1b8c8b88481c53de91761dc67b7202d9ccd Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Fri, 4 Jan 2019 14:13:10 +1100 Subject: [PATCH 1/6] Remove version constraint on Bundler gem --- money.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/money.gemspec b/money.gemspec index a111ae29fe..17d54ee531 100644 --- a/money.gemspec +++ b/money.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.add_dependency 'i18n', [">= 0.6.4", '<= 2'] - s.add_development_dependency "bundler", "~> 1.3" + s.add_development_dependency "bundler" s.add_development_dependency "rake" s.add_development_dependency "rspec", "~> 3.4" s.add_development_dependency "yard", "~> 0.9.11" From 29b6d7c69bd338181ac69157d3bc5a92d9f7ed8c Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Fri, 4 Jan 2019 14:15:08 +1100 Subject: [PATCH 2/6] Ensure Bundler is installed on CI agents --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c1b535bf0..c3c127cafa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: - rvm: rbx-3 fast_finish: true before_install: - - gem update bundler + - gem install bundler script: bundle exec rspec spec notifications: email: From d9e3d6e4a08c71bde5e098abc6f07138d781f1f7 Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Fri, 4 Jan 2019 14:23:10 +1100 Subject: [PATCH 3/6] Ensure Bundler version 1.17.3 is installed For compatibility with legacy Ruby releases --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c3c127cafa..f21a7a948b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: - rvm: rbx-3 fast_finish: true before_install: - - gem install bundler + - gem install bundler --version 1.17.3 script: bundle exec rspec spec notifications: email: From ea05b8ec4dccc57bbe7920be48bae2484eea8df8 Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Fri, 4 Jan 2019 15:40:34 +1100 Subject: [PATCH 4/6] Pin i18n to v1.2 on Ruby 2.0, 2.1 and 2.2 --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index f9277a6a29..b952128e8e 100644 --- a/Gemfile +++ b/Gemfile @@ -12,5 +12,6 @@ elsif RUBY_VERSION =~ /^1/ gem 'tins', '~> 1.6.0' gem 'term-ansicolor', '< 1.4' end +gem 'i18n', '1.2.0' if RUBY_VERSION =~ /^2\.[012]/ gemspec From 42f17453917fd500622ae965fd33584e199739c3 Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Mon, 7 Jan 2019 11:55:25 +1100 Subject: [PATCH 5/6] Loosen constraints on i18n gem --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b952128e8e..f94c98b005 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,6 @@ elsif RUBY_VERSION =~ /^1/ gem 'tins', '~> 1.6.0' gem 'term-ansicolor', '< 1.4' end -gem 'i18n', '1.2.0' if RUBY_VERSION =~ /^2\.[012]/ +gem 'i18n', '<= 1.2.0' if RUBY_VERSION < '2.3' gemspec From 4571521d71b931dbb70412b71f97cb34faf2fff6 Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Mon, 7 Jan 2019 11:58:48 +1100 Subject: [PATCH 6/6] Loosen constraints on Bundler version We can remove this once we've stopped supporting legacy versions of Ruby. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f21a7a948b..e1381d184f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: - rvm: rbx-3 fast_finish: true before_install: - - gem install bundler --version 1.17.3 + - gem install bundler --version '~> 1.17' script: bundle exec rspec spec notifications: email: