Skip to content

Commit 5f9ca8f

Browse files
authoredJul 25, 2018
Update various gemspecs to conditionally depend on gems incompatible with JRuby (elastic#810)
* [MODEL] Update dependencies for JRuby compatibility * [STORE] Update dependencies for JRuby compatibility * [RAILS] Update dependencies for JRuby compatibility
1 parent 071fa96 commit 5f9ca8f

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed
 

‎elasticsearch-model/elasticsearch-model.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
3232

3333
s.add_development_dependency "elasticsearch-extensions"
3434

35-
s.add_development_dependency "sqlite3"
35+
s.add_development_dependency "sqlite3" unless defined?(JRUBY_VERSION)
3636
s.add_development_dependency "activemodel", "> 3"
3737

3838
s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
4545
s.add_development_dependency "mocha"
4646
s.add_development_dependency "turn"
4747
s.add_development_dependency "yard"
48-
s.add_development_dependency "ruby-prof"
48+
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
4949
s.add_development_dependency "pry"
5050

5151
s.add_development_dependency "simplecov"

‎elasticsearch-model/gemfiles/3.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ gemspec path: '../'
1010
gem 'activemodel', '>= 3.0'
1111
gem 'activerecord', '~> 3.2'
1212
gem 'mongoid', '>= 3.0'
13-
gem 'sqlite3'
13+
gem 'sqlite3' unless defined?(JRUBY_VERSION)

‎elasticsearch-model/gemfiles/4.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ gemspec path: '../'
99

1010
gem 'activemodel', '~> 4'
1111
gem 'activerecord', '~> 4'
12-
gem 'sqlite3'
12+
gem 'sqlite3' unless defined?(JRUBY_VERSION)

‎elasticsearch-model/gemfiles/5.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ gemspec path: '../'
99

1010
gem 'activemodel', '~> 5'
1111
gem 'activerecord', '~> 5'
12-
gem 'sqlite3'
12+
gem 'sqlite3' unless defined?(JRUBY_VERSION)

‎elasticsearch-persistence/elasticsearch-persistence.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
4545
s.add_development_dependency "mocha"
4646
s.add_development_dependency "turn"
4747
s.add_development_dependency "yard"
48-
s.add_development_dependency "ruby-prof"
48+
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
4949
s.add_development_dependency "pry"
5050

5151
s.add_development_dependency "simplecov"

‎elasticsearch-rails/elasticsearch-rails.gemspec

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
2929
s.add_development_dependency "elasticsearch-extensions"
3030
s.add_development_dependency "elasticsearch-model"
3131

32-
s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
3332
s.add_development_dependency "rails", ">= 3.1"
3433

3534
s.add_development_dependency "lograge"
@@ -40,7 +39,7 @@ Gem::Specification.new do |s|
4039
s.add_development_dependency "mocha"
4140
s.add_development_dependency "turn"
4241
s.add_development_dependency "yard"
43-
s.add_development_dependency "ruby-prof"
42+
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
4443
s.add_development_dependency "pry"
4544

4645
s.add_development_dependency "simplecov"

0 commit comments

Comments
 (0)