Bumped to 1.4.2 and fixed dependencies on json-jruby

kaiwren · Apr 4, 2011 · d9e7cfc · d9e7cfc
1 parent bb46649
commit d9e7cfc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,9 @@ Features under the section marked 'Current' are completed but pending release as
 
 Features under a numbered section are complete and available in the Wrest gem.
 
+== 1.4.2
+ * GH#102 Code and gemspec mismatch for json-jruby
+
 == 1.4.1
  * GH#66 HTTPS requests using the Net::HTTP backend failing on Ruby 1.8.x
 

diff --git a/lib/wrest.rb b/lib/wrest.rb
@@ -7,7 +7,7 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 require 'rubygems'
-gem 'activesupport', '>= 3.0.0'
+gem 'activesupport', '~> 3.0'
 
 require 'net/http'
 require 'net/https'
@@ -55,7 +55,7 @@ def self.use_curl!
 Wrest.logger = ActiveSupport::BufferedLogger.new(STDOUT)
 Wrest.logger.level = Logger::DEBUG
 
-RUBY_PLATFORM =~ /java/ ? gem('json-jruby', '>= 1.5.0') : gem('json', '>= 1.4.2')
+gem('json', '~> 1.5')
 ActiveSupport::JSON.backend = "JSONGem"
 
 require "#{Wrest::Root}/wrest/core_ext/string"

diff --git a/lib/wrest/version.rb b/lib/wrest/version.rb
@@ -8,5 +8,5 @@
 # See the License for the specific language governing permissions and limitations under the License. 
 
 module Wrest
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end
diff --git a/wrest.gemspec b/wrest.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "Wrest is a fluent, object oriented HTTP client library for 1.8, 1.9, JRuby and Rubinius."
   s.description = "Wrest is a fluent, easy-to-use, object oriented Ruby HTTP/REST client library with support for RFC2616 HTTP caching, multiple HTTP backends and async calls using EventMachine. It runs on CRuby, JRuby and Rubinius."
 
-  s.required_rubygems_version = ">= 1.3.7"
+  s.required_rubygems_version = "> 1.5"
   s.rubyforge_project = "wrest"
 
   s.requirements << "To use Memcached as caching back-end, install the 'dalli' gem."
@@ -29,22 +29,19 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rubyforge"
 
   # Test dependencies
-  s.add_development_dependency "rspec", ["~> 2.4.0"]
+  s.add_development_dependency "rspec", ["~> 2.5.0"]
   s.add_development_dependency "sinatra", ["~> 1.0.0"]
   s.add_development_dependency "metric_fu" unless Object.const_defined?('RUBY_ENGINE') && RUBY_ENGINE =~ /rbx/
 
-  s.add_runtime_dependency "activesupport", ["~> 3.0.0"]
-  s.add_runtime_dependency "builder", ["~> 2.1.2"]
-  s.add_runtime_dependency "i18n", ['>= 0.4.1']
-
+  s.add_runtime_dependency "activesupport", ["~> 3.0"]
+  s.add_runtime_dependency "builder", ["~> 2.0"]
+  s.add_runtime_dependency "i18n", ['~> 0.4']
+  s.add_runtime_dependency("json", ["~> 1.5"])
+
   case RUBY_PLATFORM
   when /java/
-    s.add_runtime_dependency("jruby-openssl", ["~> 0.7.0"])
-    s.add_runtime_dependency("json-jruby", ["~> 1.5.0"])
-    s.add_runtime_dependency("nokogiri", ["~> 1.4.4"])
+    s.add_runtime_dependency("jruby-openssl", ["~> 0.7"])
     s.platform    = Gem::Platform::CURRENT
-  else
-    s.add_runtime_dependency "json", ["~> 1.4.6"]
   end
 end