From 883fbbc0dcb5d1d7ae6cae718f13d1bc336c5d12 Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Mon, 2 Jul 2018 15:13:43 +0200 Subject: [PATCH 1/3] [MODEL] Update dependencies for JRuby compatibility --- elasticsearch-model/elasticsearch-model.gemspec | 4 ++-- elasticsearch-model/gemfiles/3.0.gemfile | 2 +- elasticsearch-model/gemfiles/4.0.gemfile | 2 +- elasticsearch-model/gemfiles/5.0.gemfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elasticsearch-model/elasticsearch-model.gemspec b/elasticsearch-model/elasticsearch-model.gemspec index 5cd1bcec1..9e52c400a 100644 --- a/elasticsearch-model/elasticsearch-model.gemspec +++ b/elasticsearch-model/elasticsearch-model.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_development_dependency "elasticsearch-extensions" - s.add_development_dependency "sqlite3" + s.add_development_dependency "sqlite3" unless defined?(JRUBY_VERSION) s.add_development_dependency "activemodel", "> 3" s.add_development_dependency "oj" unless defined?(JRUBY_VERSION) @@ -45,7 +45,7 @@ Gem::Specification.new do |s| s.add_development_dependency "mocha" s.add_development_dependency "turn" s.add_development_dependency "yard" - s.add_development_dependency "ruby-prof" + s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) s.add_development_dependency "pry" s.add_development_dependency "simplecov" diff --git a/elasticsearch-model/gemfiles/3.0.gemfile b/elasticsearch-model/gemfiles/3.0.gemfile index 23cbdf53d..97ea5f60a 100644 --- a/elasticsearch-model/gemfiles/3.0.gemfile +++ b/elasticsearch-model/gemfiles/3.0.gemfile @@ -10,4 +10,4 @@ gemspec path: '../' gem 'activemodel', '>= 3.0' gem 'activerecord', '~> 3.2' gem 'mongoid', '>= 3.0' -gem 'sqlite3' +gem 'sqlite3' unless defined?(JRUBY_VERSION) diff --git a/elasticsearch-model/gemfiles/4.0.gemfile b/elasticsearch-model/gemfiles/4.0.gemfile index 89044bb19..fa0cc73e9 100644 --- a/elasticsearch-model/gemfiles/4.0.gemfile +++ b/elasticsearch-model/gemfiles/4.0.gemfile @@ -9,4 +9,4 @@ gemspec path: '../' gem 'activemodel', '~> 4' gem 'activerecord', '~> 4' -gem 'sqlite3' +gem 'sqlite3' unless defined?(JRUBY_VERSION) diff --git a/elasticsearch-model/gemfiles/5.0.gemfile b/elasticsearch-model/gemfiles/5.0.gemfile index 75b8a7ca9..77e10c7bb 100644 --- a/elasticsearch-model/gemfiles/5.0.gemfile +++ b/elasticsearch-model/gemfiles/5.0.gemfile @@ -9,4 +9,4 @@ gemspec path: '../' gem 'activemodel', '~> 5' gem 'activerecord', '~> 5' -gem 'sqlite3' +gem 'sqlite3' unless defined?(JRUBY_VERSION) From c60821c04db98e06a9e40a8a034e15b5bd3e588b Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Mon, 2 Jul 2018 15:13:57 +0200 Subject: [PATCH 2/3] [STORE] Update dependencies for JRuby compatibility --- elasticsearch-persistence/elasticsearch-persistence.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch-persistence/elasticsearch-persistence.gemspec b/elasticsearch-persistence/elasticsearch-persistence.gemspec index 38ba93594..e90f2afb1 100644 --- a/elasticsearch-persistence/elasticsearch-persistence.gemspec +++ b/elasticsearch-persistence/elasticsearch-persistence.gemspec @@ -45,7 +45,7 @@ Gem::Specification.new do |s| s.add_development_dependency "mocha" s.add_development_dependency "turn" s.add_development_dependency "yard" - s.add_development_dependency "ruby-prof" + s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) s.add_development_dependency "pry" s.add_development_dependency "simplecov" From 6c982a8fe598735ce5656b354413eb6f6394d293 Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Mon, 2 Jul 2018 15:15:15 +0200 Subject: [PATCH 3/3] [RAILS] Update dependencies for JRuby compatibility --- elasticsearch-rails/elasticsearch-rails.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/elasticsearch-rails/elasticsearch-rails.gemspec b/elasticsearch-rails/elasticsearch-rails.gemspec index aa976c675..c7dbf32d5 100644 --- a/elasticsearch-rails/elasticsearch-rails.gemspec +++ b/elasticsearch-rails/elasticsearch-rails.gemspec @@ -29,7 +29,6 @@ Gem::Specification.new do |s| s.add_development_dependency "elasticsearch-extensions" s.add_development_dependency "elasticsearch-model" - s.add_development_dependency "oj" unless defined?(JRUBY_VERSION) s.add_development_dependency "rails", ">= 3.1" s.add_development_dependency "lograge" @@ -40,7 +39,7 @@ Gem::Specification.new do |s| s.add_development_dependency "mocha" s.add_development_dependency "turn" s.add_development_dependency "yard" - s.add_development_dependency "ruby-prof" + s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) s.add_development_dependency "pry" s.add_development_dependency "simplecov"