Skip to content

Commit 044020f

Browse files
committed
Avoid requiring files of the gem in Rakefile to avoid redefined method warnings
1 parent 09bfcd0 commit 044020f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Rakefile

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
22
edge_version = File.read("#{__dir__}/lib/concurrent-ruby-edge/concurrent/edge/version.rb")[/'(.+)'/, 1] or raise
3-
require_relative 'lib/concurrent-ruby/concurrent/utility/engine'
43

54
core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec')
65
ext_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-ext.gemspec')
76
edge_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-edge.gemspec')
87

98
require 'rake/javaextensiontask'
109

11-
ENV['JRUBY_HOME'] = ENV['CONCURRENT_JRUBY_HOME'] if ENV['CONCURRENT_JRUBY_HOME'] && !Concurrent.on_jruby?
10+
ENV['JRUBY_HOME'] = ENV['CONCURRENT_JRUBY_HOME'] if ENV['CONCURRENT_JRUBY_HOME'] && RUBY_ENGINE != 'jruby'
1211

1312
Rake::JavaExtensionTask.new('concurrent_ruby', core_gemspec) do |ext|
1413
ext.ext_dir = 'ext/concurrent-ruby'
1514
ext.lib_dir = 'lib/concurrent-ruby/concurrent'
1615
end
1716

18-
unless Concurrent.on_jruby? || Concurrent.on_truffleruby?
17+
if RUBY_ENGINE == 'ruby'
1918
require 'rake/extensiontask'
2019

2120
Rake::ExtensionTask.new('concurrent_ruby_ext', ext_gemspec) do |ext|
@@ -68,7 +67,7 @@ require 'rubygems'
6867
require 'rubygems/package_task'
6968

7069
Gem::PackageTask.new(core_gemspec) {} if core_gemspec
71-
Gem::PackageTask.new(ext_gemspec) {} if ext_gemspec && !Concurrent.on_jruby?
70+
Gem::PackageTask.new(ext_gemspec) {} if ext_gemspec && RUBY_ENGINE != 'jruby'
7271
Gem::PackageTask.new(edge_gemspec) {} if edge_gemspec
7372

7473
CLEAN.include(
@@ -97,7 +96,7 @@ begin
9796
Bundler.with_original_env do
9897
Dir.chdir(__dir__) do
9998
sh "gem install pkg/concurrent-ruby-#{version}.gem"
100-
sh "gem install pkg/concurrent-ruby-ext-#{version}.gem" if Concurrent.on_cruby?
99+
sh "gem install pkg/concurrent-ruby-ext-#{version}.gem" if RUBY_ENGINE == 'ruby'
101100
sh "gem install pkg/concurrent-ruby-edge-#{edge_version}.gem"
102101
ENV['NO_PATH'] = 'true'
103102
sh 'bundle update'

0 commit comments

Comments
 (0)