json gem gives me the shits

d11wtq · Jul 9, 2011 · 6cf7737 · 6cf7737
1 parent 26627e7
commit 6cf7737
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,8 +10,8 @@ DM_VERSION   = '~> 1.1.1'
 gem 'dm-serializer', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-serializer#{REPO_POSTFIX}"
 
 gem 'multi_json',  '~> 1.0.3'
-gem 'json',        '~> 1.5.1'
-gem 'json_pure',   '~> 1.5.1'
+gem 'json',        '>= 1.4.6', '~> 1.5.1'
+gem 'json_pure',   '>= 1.4.6', '~> 1.5.1'
 
 group :development do
 

diff --git a/dm-rest-adapter.gemspec b/dm-rest-adapter.gemspec
@@ -72,17 +72,17 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.1.1"])
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_runtime_dependency(%q<json>, ["~> 1.5.1"])
-      s.add_runtime_dependency(%q<json_pure>, ["~> 1.5.1"])
+      s.add_runtime_dependency(%q<json>, [">= 1.4.6", "~> 1.5.1"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.4.6", "~> 1.5.1"])
       s.add_development_dependency(%q<dm-validations>, ["~> 1.1.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
       s.add_dependency(%q<dm-serializer>, ["~> 1.1.1"])
       s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_dependency(%q<json>, ["~> 1.5.1"])
-      s.add_dependency(%q<json_pure>, ["~> 1.5.1"])
+      s.add_dependency(%q<json>, [">= 1.4.6", "~> 1.5.1"])
+      s.add_dependency(%q<json_pure>, [">= 1.4.6", "~> 1.5.1"])
       s.add_dependency(%q<dm-validations>, ["~> 1.1.1"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
@@ -91,8 +91,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<dm-serializer>, ["~> 1.1.1"])
     s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-    s.add_dependency(%q<json>, ["~> 1.5.1"])
-    s.add_dependency(%q<json_pure>, ["~> 1.5.1"])
+    s.add_dependency(%q<json>, [">= 1.4.6", "~> 1.5.1"])
+    s.add_dependency(%q<json_pure>, [">= 1.4.6", "~> 1.5.1"])
     s.add_dependency(%q<dm-validations>, ["~> 1.1.1"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])