diff options
author | Florian Frank <flori@ping.de> | 2017-04-18 11:13:54 +0200 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2017-04-18 11:13:54 +0200 |
commit | 4032b3829dfc2e7cd903905b1d2275160b4da077 (patch) | |
tree | 07d9f07f60955735288ddc61b8bdd502f947e9fc | |
parent | 7cd07fabbe8ca1242304eb21ac8245eef0fb9343 (diff) | |
parent | 27eeabf4c9a4916adf5a42554bfa451034653167 (diff) | |
download | json-4032b3829dfc2e7cd903905b1d2275160b4da077.tar.gz |
Merge branch 'fix_jruby_gemspec_bug' of https://github.com/xb/json
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | json-java.gemspec (renamed from java/json.gemspec) | 6 |
3 files changed, 3 insertions, 7 deletions
@@ -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 @@ -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" |