Merge decimal_class patch by Michael Jaschob

Also:
- Avoid some issues with bundler
- Avoid some issues with jruby

1 files changed, 3 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index f10f366..3e8d065 100644
--- a/Rakefile
+++ b/Rakefile
@@ -251,13 +251,13 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
 
   desc "Package the jruby gem"
   task :jruby_gem => :create_jar do
-    sh 'gem build json-java.gemspec'
+    sh 'gem build java/json.gemspec'
     mkdir_p 'pkg'
     mv "json-#{PKG_VERSION}-java.gem", 'pkg'
   end
 
   desc "Testing library (jruby)"
-  task :test_ext => [ :create_jar, :check_env, :do_test_ext ]
+  task :test_ext => [ :check_env, :create_jar, :do_test_ext ]
 
   UndocumentedTestTask.new do |t|
     t.name = 'do_test_ext'
@@ -331,7 +331,7 @@ else
   end
 
   desc "Testing library (extension)"
-  task :test_ext => [ :compile, :check_env, :do_test_ext ]
+  task :test_ext => [ :check_env, :compile, :do_test_ext ]
 
   UndocumentedTestTask.new do |t|
     t.name = 'do_test_ext'