Skip to content

Commit 738357c

Browse files
committed
[CI] Fixes dependency on jbuilder
1 parent 3d918b4 commit 738357c

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

elasticsearch-api/elasticsearch-api.gemspec

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,17 @@ Gem::Specification.new do |s|
6262
# Gems for testing integrations
6363
s.add_development_dependency 'jsonify'
6464
s.add_development_dependency 'hashie'
65+
# Temporary support for Ruby 2.6, since it's EOL March 2022:
66+
if RUBY_VERSION < '2.7.0'
67+
s.add_development_dependency 'jbuilder', '< 7.0.0'
68+
else
69+
s.add_development_dependency 'activesupport'
70+
s.add_development_dependency 'jbuilder'
71+
end
6572

6673
s.add_development_dependency 'cane'
6774
s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION
68-
s.add_development_dependency 'jbuilder'
75+
6976
s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
7077
s.add_development_dependency 'simplecov'
7178
s.add_development_dependency 'test-unit', '~> 2'

elasticsearch-api/spec/spec_helper.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
require 'pry-byebug'
2626
end
2727
require 'ansi'
28+
require 'yaml'
29+
require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
30+
require 'jbuilder'
31+
require 'jsonify'
2832
require 'elasticsearch'
2933
require 'elasticsearch-api'
3034
require 'elasticsearch-transport'

0 commit comments

Comments
 (0)