From 83f3b8a2676307a39cc1486ce7b23deef21d27c2 Mon Sep 17 00:00:00 2001 From: Eugen Minciu Date: Thu, 18 Jan 2018 17:13:09 +0200 Subject: [PATCH 1/4] Update dependencies --- Gemfile | 3 ++- Gemfile.lock | 34 +++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 8ef4f22..0cf7ac2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,8 @@ source 'https://rubygems.org' group :development do gem "rake" - gem "yard", "~> 0.7" + gem "yard", "~> 0.9" + gem "json", "~> 2.1.0" gem "rdoc", ">= 3.2.0" gem "bundler", ">= 1.0.0" gem "shoulda", ">= 0" diff --git a/Gemfile.lock b/Gemfile.lock index b528470..0837c4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,44 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.5.1) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - i18n (0.7.0) - json (1.8.3) + concurrent-ruby (1.0.5) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + json (2.1.0) metaclass (0.0.4) - minitest (5.8.3) - mocha (1.1.0) + minitest (5.11.1) + mocha (1.3.0) metaclass (~> 0.0.1) - rake (10.4.2) - rdoc (4.2.2) - json (~> 1.4) + rake (12.3.0) + rdoc (6.0.1) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (>= 1.4.1, < 3.0) - shoulda-context (1.2.1) + shoulda-context (1.2.2) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - thread_safe (0.3.5) - tzinfo (1.2.2) + thread_safe (0.3.6) + tzinfo (1.2.4) thread_safe (~> 0.1) - yard (0.7.5) + yard (0.9.12) PLATFORMS ruby DEPENDENCIES bundler (>= 1.0.0) + json (~> 2.1.0) minitest (>= 5.0.0) mocha rake rdoc (>= 3.2.0) shoulda - yard (~> 0.7) + yard (~> 0.9) + +BUNDLED WITH + 1.15.1 From f6e842a7ba5e9d24845f55e7f23445bf81a85c1f Mon Sep 17 00:00:00 2001 From: Eugen Minciu Date: Thu, 18 Jan 2018 17:19:25 +0200 Subject: [PATCH 2/4] Fix activesupport dependency for older Rubies --- Gemfile | 1 + Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 0cf7ac2..d438932 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source 'https://rubygems.org' group :development do gem "rake" + gem "activesupport", "~> 4.2" gem "yard", "~> 0.9" gem "json", "~> 2.1.0" gem "rdoc", ">= 3.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 0837c4d..b4b6962 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.1.4) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) concurrent-ruby (1.0.5) i18n (0.9.1) @@ -31,6 +31,7 @@ PLATFORMS ruby DEPENDENCIES + activesupport (~> 4.2) bundler (>= 1.0.0) json (~> 2.1.0) minitest (>= 5.0.0) From 9deb86dbfafe605e67a4c6618b8d8f1d362fb903 Mon Sep 17 00:00:00 2001 From: Eugen Minciu Date: Thu, 18 Jan 2018 17:41:02 +0200 Subject: [PATCH 3/4] Fix rdoc spec so it works with older rubies. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d438932..e3ed952 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ group :development do gem "activesupport", "~> 4.2" gem "yard", "~> 0.9" gem "json", "~> 2.1.0" - gem "rdoc", ">= 3.2.0" + gem "rdoc", "~> 5.0.0" gem "bundler", ">= 1.0.0" gem "shoulda", ">= 0" gem "mocha", ">= 0" diff --git a/Gemfile.lock b/Gemfile.lock index b4b6962..4b776ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ GEM mocha (1.3.0) metaclass (~> 0.0.1) rake (12.3.0) - rdoc (6.0.1) + rdoc (5.0.0) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (>= 1.4.1, < 3.0) @@ -37,7 +37,7 @@ DEPENDENCIES minitest (>= 5.0.0) mocha rake - rdoc (>= 3.2.0) + rdoc (~> 5.0.0) shoulda yard (~> 0.9) From 8f6543cd33bdf1a16c8fe35b5a2fc0c5823f46cd Mon Sep 17 00:00:00 2001 From: Eugen Minciu Date: Thu, 18 Jan 2018 17:49:14 +0200 Subject: [PATCH 4/4] Fix rake dependency for older Rubies --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e3ed952..0910813 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' group :development do - gem "rake" + gem "rake", "~> 11.0" gem "activesupport", "~> 4.2" gem "yard", "~> 0.9" gem "json", "~> 2.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 4b776ea..626f344 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM minitest (5.11.1) mocha (1.3.0) metaclass (~> 0.0.1) - rake (12.3.0) + rake (11.3.0) rdoc (5.0.0) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) @@ -36,7 +36,7 @@ DEPENDENCIES json (~> 2.1.0) minitest (>= 5.0.0) mocha - rake + rake (~> 11.0) rdoc (~> 5.0.0) shoulda yard (~> 0.9)