Skip to content
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

Trying to upgrade gems and add support for Rails 7 #128

Closed
wants to merge 2 commits into from
Closed

Trying to upgrade gems and add support for Rails 7 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e67b5c2
updating gems
igorkasyanchuk May 6, 2021
d311719
fixing rubocop issue
igorkasyanchuk May 6, 2021
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
5 changes: 5 additions & 0 deletions .travis.yml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ gemfile:
- gemfiles/rails5.2.4.3.gemfile
- gemfiles/rails6.0.3.1.gemfile
- gemfiles/rails6.1.0.gemfile
- gemfiles/railsedge.gemfile
matrix:
exclude:
- rvm: 2.4.10
Expand All @@ -30,6 +31,10 @@ matrix:
gemfile: gemfiles/rails6.0.3.1.gemfile
- rvm: 2.4.10
gemfile: gemfiles/rails6.1.0.gemfile
- rvm: 2.4.10
gemfile: gemfiles/railsedge.gemfile
- rvm: 2.5.8
gemfile: gemfiles/railsedge.gemfile
fast_finish: true
before_install:
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
Expand Down
6 changes: 6 additions & 0 deletions Appraisals
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,9 @@ appraise 'active6.1.0' do
gem 'activesupport', '6.1.0'
gem 'activerecord', '6.1.0'
end

appraise 'railsedge' do
gem 'rails', git: 'git@github.com:rails/rails.git', branch: 'main'
gem 'activesupport'
gem 'activerecord'
end
5 changes: 3 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -41,7 +41,7 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
minitest (5.14.1)
minitest (5.14.4)
multi_json (1.1.0)
netrc (0.11.0)
parallel (1.17.0)
Expand Down Expand Up @@ -108,6 +108,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand Down
3 changes: 2 additions & 1 deletion comma.gemspec
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ Gem::Specification.new do |s|

s.licenses = ['MIT']

s.add_dependency 'activesupport', ['>= 4.2.0', '< 6.2']
s.add_dependency 'activesupport', '>= 4.2.0'

s.add_development_dependency 'appraisal', ['~> 1.0.0']
s.add_development_dependency 'minitest', '5.14.4'
s.add_development_dependency 'rake', '~> 13.0.1'
s.add_development_dependency 'rspec', ['~> 3.5.0']
s.add_development_dependency 'rspec-activemodel-mocks'
Expand Down
37 changes: 19 additions & 18 deletions gemfiles/active5.0.7.2.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand All @@ -23,27 +23,27 @@ GEM
rake
thor (>= 0.14.0)
arel (7.1.4)
ast (2.4.1)
concurrent-ruby (1.1.6)
ast (2.4.2)
concurrent-ruby (1.1.8)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
diff-lcs (1.3)
docile (1.3.2)
i18n (1.8.3)
diff-lcs (1.4.4)
docile (1.3.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.3.0)
minitest (5.14.1)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
psych (3.1.0)
json (2.5.1)
minitest (5.14.4)
parallel (1.20.1)
parser (3.0.1.1)
ast (~> 2.4.1)
psych (3.3.1)
rainbow (3.0.0)
rake (13.0.1)
rake (13.0.3)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand Down Expand Up @@ -74,21 +74,21 @@ GEM
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
ruby-progressbar (1.10.1)
ruby-progressbar (1.11.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sqlite3 (1.3.11)
sqlite3 (1.4.2)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.0.1)
thor (1.1.0)
thread_safe (0.3.6)
tins (1.25.0)
tins (1.28.0)
sync
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unicode-display_width (1.5.0)

Expand All @@ -101,6 +101,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand Down
35 changes: 18 additions & 17 deletions gemfiles/active5.1.7.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand All @@ -23,27 +23,27 @@ GEM
rake
thor (>= 0.14.0)
arel (8.0.0)
ast (2.4.1)
concurrent-ruby (1.1.6)
ast (2.4.2)
concurrent-ruby (1.1.8)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
diff-lcs (1.3)
docile (1.3.2)
i18n (1.8.3)
diff-lcs (1.4.4)
docile (1.3.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.3.0)
minitest (5.14.1)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
psych (3.1.0)
json (2.5.1)
minitest (5.14.4)
parallel (1.20.1)
parser (3.0.1.1)
ast (~> 2.4.1)
psych (3.3.1)
rainbow (3.0.0)
rake (13.0.1)
rake (13.0.3)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand Down Expand Up @@ -74,7 +74,7 @@ GEM
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
ruby-progressbar (1.10.1)
ruby-progressbar (1.11.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand All @@ -84,11 +84,11 @@ GEM
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.0.1)
thor (1.1.0)
thread_safe (0.3.6)
tins (1.25.0)
tins (1.28.0)
sync
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unicode-display_width (1.5.0)

Expand All @@ -101,6 +101,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand Down
37 changes: 19 additions & 18 deletions gemfiles/active5.2.4.3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand All @@ -23,27 +23,27 @@ GEM
rake
thor (>= 0.14.0)
arel (9.0.0)
ast (2.4.1)
concurrent-ruby (1.1.6)
ast (2.4.2)
concurrent-ruby (1.1.8)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
diff-lcs (1.3)
docile (1.3.2)
i18n (1.8.3)
diff-lcs (1.4.4)
docile (1.3.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.3.0)
minitest (5.14.1)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
psych (3.1.0)
json (2.5.1)
minitest (5.14.4)
parallel (1.20.1)
parser (3.0.1.1)
ast (~> 2.4.1)
psych (3.3.1)
rainbow (3.0.0)
rake (13.0.1)
rake (13.0.3)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand Down Expand Up @@ -74,21 +74,21 @@ GEM
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
ruby-progressbar (1.10.1)
ruby-progressbar (1.11.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sqlite3 (1.3.13)
sqlite3 (1.4.2)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.0.1)
thor (1.1.0)
thread_safe (0.3.6)
tins (1.25.0)
tins (1.28.0)
sync
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unicode-display_width (1.5.0)

Expand All @@ -101,6 +101,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand Down
Loading