Skip to content

Commit 64deb2b

Browse files
authored
Add Ruby 2.7 & Rails 6 (#104)
1 parent 984ca37 commit 64deb2b

File tree

9 files changed

+31
-13
lines changed

9 files changed

+31
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
ruby: [ '2.5', '2.6' ]
11-
rails: [ '5.0', '5.2' ]
10+
ruby: [ '2.5', '2.6', '2.7' ]
11+
rails: [ '5.0', '5.2', '6.0', '6.1' ]
1212
name: Ruby ${{ matrix.ruby }} with Rails ${{ matrix.rails }}
1313
steps:
1414
- uses: actions/checkout@v2

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
source 'https://rubygems.org'
33

44
gemspec
5+
6+
gem 'simplecov', :require => false, :group => :test

bin/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
for i in 5.0 5.2; do
3+
for i in 5.0 5.2 6.0 6.1; do
44
echo "Testing active_record $i:"
55
rm -f Gemfile.lock
66
rm -f gemfiles/Gemfile.rails-$i.lock

gemfiles/Gemfile.rails-5.0

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
source "https://rubygems.org"
22
gemspec path: '..'
33

4-
gem 'rake', '< 11.0'
4+
gem 'rake'
55
gem 'actionpack', '~> 5.0.0'
66
gem 'railties', '~> 5.0.0'
77
gem 'activerecord', '~> 5.0.0'
8-
gem 'simplecov', :require => false, :group => :test

gemfiles/Gemfile.rails-5.2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
source "https://rubygems.org"
22
gemspec path: '..'
33

4-
gem 'rake', '< 11.0'
4+
gem 'rake'
55
gem 'actionpack', '~> 5.2.0'
66
gem 'railties', '~> 5.2.0'
77
gem 'activerecord', '~> 5.2.0'
8-
gem 'simplecov', :require => false, :group => :test

gemfiles/Gemfile.rails-6.0

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source "https://rubygems.org"
2+
gemspec path: '..'
3+
4+
gem 'rake'
5+
gem 'actionpack', '~> 6.0.0'
6+
gem 'railties', '~> 6.0.0'
7+
gem 'activerecord', '~> 6.0.0'
8+
9+
gem 'sqlite3', '~> 1.4'

gemfiles/Gemfile.rails-6.1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source "https://rubygems.org"
2+
gemspec path: '..'
3+
4+
gem 'rake'
5+
gem 'actionpack', '~> 6.1.0'
6+
gem 'railties', '~> 6.1.0'
7+
gem 'activerecord', '~> 6.1.0'
8+
9+
gem 'sqlite3', '~> 1.4'

spec/feed_manager_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
describe '#created_activity' do
1111
let(:instance) { Article.new }
1212
it 'should not create activity' do
13-
instance.class_eval do
13+
instance.instance_eval do
1414
def activity_should_sync?
1515
false
1616
end

stream_rails.gemspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ Gem::Specification.new do |gem|
1313
gem.files = Dir['lib/**/*']
1414
gem.license = 'Apache-2.0'
1515

16-
gem.required_ruby_version = '>= 1.9.2'
16+
gem.required_ruby_version = '>= 2.5.5'
1717

18-
gem.add_dependency 'actionpack', '>= 3.0.0'
19-
gem.add_dependency 'railties', '>= 3.0.0'
18+
gem.add_dependency 'actionpack', '>= 5.0.0'
19+
gem.add_dependency 'railties', '>= 5.0.0'
2020
gem.add_dependency 'stream-ruby', '~> 4.0.1'
21-
gem.add_dependency 'activerecord', '>= 3.0.0'
21+
gem.add_dependency 'activerecord', '>= 5.0.0'
2222

2323
gem.add_development_dependency 'rake'
2424
gem.add_development_dependency 'sqlite3', '~> 1.3.13'
25-
gem.add_development_dependency 'rspec', '~> 3.8'
25+
gem.add_development_dependency 'rspec', '~> 3.10'
2626
gem.add_development_dependency 'simplecov', '~> 0.16.1'
2727
gem.add_development_dependency 'sequel', '~> 4.49'
2828
end

0 commit comments

Comments
 (0)