Skip to content

Update various gemspecs to conditionally depend on gems incompatible with JRuby #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 25, 2018
Merged

Update various gemspecs to conditionally depend on gems incompatible with JRuby #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
883fbbc
[MODEL] Update dependencies for JRuby compatibility
estolfo Jul 2, 2018
c60821c
[STORE] Update dependencies for JRuby compatibility
estolfo Jul 2, 2018
6c982a8
[RAILS] Update dependencies for JRuby compatibility
estolfo Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions elasticsearch-model/elasticsearch-model.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch-model/gemfiles/3.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion elasticsearch-model/gemfiles/4.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ gemspec path: '../'

gem 'activemodel', '~> 4'
gem 'activerecord', '~> 4'
gem 'sqlite3'
gem 'sqlite3' unless defined?(JRUBY_VERSION)
2 changes: 1 addition & 1 deletion elasticsearch-model/gemfiles/5.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ gemspec path: '../'

gem 'activemodel', '~> 5'
gem 'activerecord', '~> 5'
gem 'sqlite3'
gem 'sqlite3' unless defined?(JRUBY_VERSION)
2 changes: 1 addition & 1 deletion elasticsearch-persistence/elasticsearch-persistence.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions elasticsearch-rails/elasticsearch-rails.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down