Skip to content

Commit f131214

Browse files
committed
Avoid require in *.gemspec files to avoid redefined constant warnings
* Like: concurrent-ruby/vendor/bundle/ruby/3.2.0/gems/concurrent-ruby-1.3.4/lib/concurrent-ruby/concurrent/version.rb:2: warning: already initialized constant Concurrent::VERSION concurrent-ruby/lib/concurrent-ruby/concurrent/version.rb:2: warning: previous definition of VERSION was here
1 parent 13badd0 commit f131214

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

concurrent-ruby-edge.gemspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
require File.join(File.dirname(__FILE__ ), 'lib/concurrent-ruby/concurrent/version')
2-
require File.join(File.dirname(__FILE__ ), 'lib/concurrent-ruby-edge/concurrent/edge/version')
1+
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
2+
edge_version = File.read("#{__dir__}/lib/concurrent-ruby-edge/concurrent/edge/version.rb")[/'(.+)'/, 1] or raise
33

44
Gem::Specification.new do |s|
55
git_files = `git ls-files`.split("\n")
66

77
s.name = 'concurrent-ruby-edge'
8-
s.version = Concurrent::EDGE_VERSION
8+
s.version = edge_version
99
s.platform = Gem::Platform::RUBY
1010
s.authors = ["Jerry D'Antonio", 'Petr Chalupa', 'The Ruby Concurrency Team']
1111
s.email = '[email protected]'
@@ -25,5 +25,5 @@ Please see http://concurrent-ruby.com for more information.
2525

2626
s.required_ruby_version = '>= 2.3'
2727

28-
s.add_runtime_dependency 'concurrent-ruby', "~> #{Concurrent::VERSION.split('.')[0..1].join('.')}"
28+
s.add_runtime_dependency 'concurrent-ruby', "~> #{version.split('.')[0..1].join('.')}"
2929
end

concurrent-ruby-ext.gemspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require File.join(File.dirname(__FILE__ ), 'lib/concurrent-ruby/concurrent/version')
1+
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
22

33
Gem::Specification.new do |s|
44
s.name = 'concurrent-ruby-ext'
5-
s.version = Concurrent::VERSION
5+
s.version = version
66
s.platform = Gem::Platform::RUBY
77
s.authors = ["Jerry D'Antonio", 'The Ruby Concurrency Team']
88
s.email = '[email protected]'
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
2323

2424
s.required_ruby_version = '>= 2.3'
2525

26-
s.add_runtime_dependency 'concurrent-ruby', "= #{Concurrent::VERSION}"
26+
s.add_runtime_dependency 'concurrent-ruby', "= #{version}"
2727
end

concurrent-ruby.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
require File.join(File.dirname(__FILE__ ), 'lib/concurrent-ruby/concurrent/version')
1+
version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise
22

33
Gem::Specification.new do |s|
44
git_files = `git ls-files`.split("\n")
55

66
s.name = 'concurrent-ruby'
7-
s.version = Concurrent::VERSION
7+
s.version = version
88
s.platform = Gem::Platform::RUBY
99
s.authors = ["Jerry D'Antonio", 'Petr Chalupa', 'The Ruby Concurrency Team']
1010
s.email = '[email protected]'

0 commit comments

Comments
 (0)