Skip to content

Commit 08c2101

Browse files
committed
Updates gemspec, spec_helper
1 parent 93fe24c commit 08c2101

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

elasticsearch-api/elasticsearch-api.gemspec

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,10 @@ Gem::Specification.new do |s|
5959
s.add_development_dependency 'yard'
6060

6161
# Gems for testing integrations
62-
s.add_development_dependency 'jsonify'
62+
s.add_development_dependency 'activesupport'
6363
s.add_development_dependency 'hashie'
64-
# Temporary support for Ruby 2.6, since it's EOL March 2022:
65-
if RUBY_VERSION < '2.7.0'
66-
s.add_development_dependency 'jbuilder', '< 7.0.0'
67-
else
68-
s.add_development_dependency 'activesupport'
69-
s.add_development_dependency 'jbuilder'
70-
end
64+
s.add_development_dependency 'jbuilder'
65+
s.add_development_dependency 'jsonify'
7166

7267
s.add_development_dependency 'cane'
7368
s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION

elasticsearch-api/spec/spec_helper.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
require 'debug'
2626
end
2727
require 'yaml'
28-
require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
28+
# Require logger before jbuilder to avoid concurrent-ruby error uninitialized constant
29+
# ActiveSupport::LoggerThreadSafeLevel::Logger. Dependencies are fun.
30+
require 'logger'
2931
require 'jbuilder'
3032
require 'jsonify'
3133
require 'elasticsearch'
3234
require 'elasticsearch-api'
3335
require 'openssl'
34-
require 'logger'
3536

36-
tracer = ::Logger.new(STDERR)
37+
tracer = ::Logger.new($stderr)
3738
tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| ' ' + n } }\n" }
3839

3940
module HelperModule

0 commit comments

Comments
 (0)