Skip to content

Commit 110b07b

Browse files
committed
Initial work on gemfiles
1 parent d9c494e commit 110b07b

File tree

8 files changed

+14
-84
lines changed

8 files changed

+14
-84
lines changed

elasticsearch-model/Rakefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ desc 'Run unit tests'
2121
task default: 'test:all'
2222
task test: 'test:all'
2323

24-
gemfiles = ['5.0.gemfile', '6.0.gemfile']
25-
gemfiles << '4.0.gemfile' if RUBY_VERSION < '2.7'
24+
gemfiles = ['6.1.gemfile', '7.0.gemfile']
2625
GEMFILES = gemfiles.freeze
2726

2827
namespace :bundle do

elasticsearch-model/elasticsearch-model.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
3939
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
4040
s.rdoc_options = ['--charset=UTF-8']
4141

42-
s.required_ruby_version = '>= 2.4'
42+
s.required_ruby_version = '>= 3'
4343

4444
s.add_dependency 'activesupport', '> 3'
4545
s.add_dependency 'elasticsearch', '~> 7'

elasticsearch-model/gemfiles/3.0.gemfile

-35
This file was deleted.

elasticsearch-model/gemfiles/4.0.gemfile

-36
This file was deleted.

elasticsearch-model/gemfiles/6.0.gemfile elasticsearch-model/gemfiles/6.1.gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ source 'https://rubygems.org'
2424

2525
gemspec path: '../'
2626

27-
gem 'activemodel', '6.0.0'
28-
gem 'activerecord', '6.0.0'
27+
gem 'activemodel', '6.1'
28+
gem 'activerecord', '6.1'
2929
gem 'sqlite3' unless defined?(JRUBY_VERSION)
3030
# gem 'mongoid', '~> 6'
3131

3232
group :development, :testing do
33+
gem 'byebug'
3334
gem 'pry-nav'
3435
gem 'rspec'
3536
end

elasticsearch-model/gemfiles/5.0.gemfile elasticsearch-model/gemfiles/7.0.gemfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@
1717

1818
# Usage:
1919
#
20-
# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle install
21-
# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle exec rake test:integration
20+
# $ BUNDLE_GEMFILE=./gemfiles/7.0.gemfile bundle install
21+
# $ BUNDLE_GEMFILE=./gemfiles/7.0.gemfile bundle exec rake test:integration
2222

2323
source 'https://rubygems.org'
2424

2525
gemspec path: '../'
2626

27-
gem 'activemodel', '~> 5'
28-
gem 'activerecord', '~> 5'
27+
gem 'activemodel', '7'
28+
gem 'activerecord', '7'
2929
gem 'sqlite3' unless defined?(JRUBY_VERSION)
30-
gem 'mongoid', '~> 6'
30+
# gem 'mongoid', '~> 6'
3131

3232
group :development, :testing do
33-
gem 'rspec'
33+
gem 'byebug'
3434
gem 'pry-nav'
35+
gem 'rspec'
3536
end

elasticsearch-persistence/elasticsearch-persistence.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
3939
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
4040
s.rdoc_options = ['--charset=UTF-8']
4141

42-
s.required_ruby_version = '>= 1.9.3'
42+
s.required_ruby_version = '>= 3'
4343

4444
s.add_dependency 'activemodel', '> 4'
4545
s.add_dependency 'activesupport', '> 4'

elasticsearch-rails/elasticsearch-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
4444
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
4545
s.rdoc_options = ['--charset=UTF-8']
4646

47-
s.required_ruby_version = '>= 2.4'
47+
s.required_ruby_version = '>= 3'
4848

4949
s.add_development_dependency 'bundler'
5050
s.add_development_dependency 'cane'

0 commit comments

Comments
 (0)