From ddff95656f1631e175944f8e54b599f4c86b57c5 Mon Sep 17 00:00:00 2001 From: Keitaroh Kobayashi Date: Sun, 14 Dec 2014 17:39:30 +0900 Subject: [PATCH 1/2] Update ActiveSupport dependency --- Gemfile.lock | 19 +++++++++++++------ ruby-xcdm.gemspec | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dbfb8cd..e02c17f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,24 +2,31 @@ PATH remote: . specs: ruby-xcdm (0.0.8) - activesupport (~> 3.2) + activesupport (~> 4.1) builder (~> 3.2) plist (~> 3.1) GEM remote: https://rubygems.org/ specs: - activesupport (3.2.17) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activesupport (4.1.8) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) ansi (1.4.3) builder (3.2.0) - i18n (0.6.9) - multi_json (1.9.2) + i18n (0.6.11) + json (1.8.1) + minitest (5.5.0) plist (3.1.0) rake (10.0.4) + thread_safe (0.3.4) turn (0.9.6) ansi + tzinfo (1.2.2) + thread_safe (~> 0.1) PLATFORMS ruby diff --git a/ruby-xcdm.gemspec b/ruby-xcdm.gemspec index d25d545..d8876a1 100644 --- a/ruby-xcdm.gemspec +++ b/ruby-xcdm.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "builder", "~> 3.2" - spec.add_dependency "activesupport", "~> 3.2" + spec.add_dependency "activesupport", "~> 4.1" spec.add_dependency "plist", "~> 3.1" spec.add_development_dependency "bundler", "~> 1.3" From 25abe60e96474646043330ea9c5a71579640b28d Mon Sep 17 00:00:00 2001 From: Keitaroh Kobayashi Date: Sun, 14 Dec 2014 17:54:02 +0900 Subject: [PATCH 2/2] Be less specific in .ruby-version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index ae6d5b9..77fee73 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3-p392 +1.9.3