Skip to content

Back-out change of directory of json-java.gemspec. #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2017
Merged

Back-out change of directory of json-java.gemspec. #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions java/json.gemspec → json-java.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down