Skip to content

Commit

Permalink
Updates gemspec, spec_helper
Browse files Browse the repository at this point in the history
  • Loading branch information
picandocodigo committed Feb 27, 2025
1 parent 93fe24c commit 08c2101
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
11 changes: 3 additions & 8 deletions elasticsearch-api/elasticsearch-api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,10 @@ Gem::Specification.new do |s|
s.add_development_dependency 'yard'

# Gems for testing integrations
s.add_development_dependency 'jsonify'
s.add_development_dependency 'activesupport'
s.add_development_dependency 'hashie'
# Temporary support for Ruby 2.6, since it's EOL March 2022:
if RUBY_VERSION < '2.7.0'
s.add_development_dependency 'jbuilder', '< 7.0.0'
else
s.add_development_dependency 'activesupport'
s.add_development_dependency 'jbuilder'
end
s.add_development_dependency 'jbuilder'
s.add_development_dependency 'jsonify'

s.add_development_dependency 'cane'
s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION
Expand Down
7 changes: 4 additions & 3 deletions elasticsearch-api/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
require 'debug'
end
require 'yaml'
require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
# Require logger before jbuilder to avoid concurrent-ruby error uninitialized constant
# ActiveSupport::LoggerThreadSafeLevel::Logger. Dependencies are fun.
require 'logger'
require 'jbuilder'
require 'jsonify'
require 'elasticsearch'
require 'elasticsearch-api'
require 'openssl'
require 'logger'

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

module HelperModule
Expand Down

0 comments on commit 08c2101

Please sign in to comment.