Merge branch 'fix_jruby_gemspec_bug' of https://github.com/xb/json

3 files changed, 3 insertions, 7 deletions

diff --git a/Gemfile b/Gemfile
index 747bc71..64f98d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 case ENV['JSON']
 when 'ext', nil
   if ENV['RUBY_ENGINE'] == 'jruby'
-    gemspec :name => 'json', :path => 'java'
+    gemspec :name => 'json-java'
   else
     gemspec :name => 'json'
   end
diff --git a/Rakefile b/Rakefile
index 017d14a..c6c195f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -251,7 +251,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
 
   desc "Package the jruby gem"
   task :jruby_gem => :create_jar do
-    sh 'gem build java/json.gemspec'
+    sh 'gem build json-java.gemspec'
     mkdir_p 'pkg'
     mv "json-#{PKG_VERSION}-java.gem", 'pkg'
   end
diff --git a/java/json.gemspec b/json-java.gemspec
index e0e4efe..1524b1f 100644
--- a/java/json.gemspec
+++ b/json-java.gemspec
@@ -3,11 +3,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |s|
   s.name = "json"
-  s.version = if File.exist?('VERSION')
-                File.read("VERSION").chomp 
-              else
-                File.read("../VERSION").chomp 
-              end
+  s.version = File.read("VERSION").chomp
   s.summary = "JSON implementation for JRuby"
   s.description = "A JSON implementation as a JRuby extension."
   s.author = "Daniel Luz"