Skip to content
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.

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

Add ruby source files to the java gem #763

Merged
merged 1 commit into from Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 3 additions & 10 deletions Rakefile
Expand Up @@ -65,16 +65,9 @@ task :default => :spec

namespace 'java' do

java_gem_spec = Gem::Specification.new do |s|
s.name = gem_spec.name
s.version = gem_spec.version
s.author = gem_spec.author
s.email = gem_spec.email
s.homepage = gem_spec.homepage
s.summary = gem_spec.summary
s.description = gem_spec.description
s.files = %w(LICENSE COPYING README.md CHANGELOG.md Rakefile)
s.license = gem_spec.license
java_gem_spec = gem_spec.dup.tap do |s|
s.files.reject! { |f| File.fnmatch?("ext/*", f) }
s.extensions = []
s.platform = 'java'
end

Expand Down
2 changes: 1 addition & 1 deletion lib/ffi.rb
Expand Up @@ -8,7 +8,7 @@

require 'ffi/ffi'

elsif RUBY_ENGINE == 'jruby'
elsif RUBY_ENGINE == 'jruby' && Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new("9.3.pre")
headius marked this conversation as resolved.
Show resolved Hide resolved
JRuby::Util.load_ext("org.jruby.ext.ffi.FFIService")
require 'ffi/ffi'

Expand Down