Skip to content

Commit

Permalink
Update dependencies (#1411)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vsppedro
vsppedro committed Feb 28, 2021
1 parent 9763c17 commit 178df49
Show file tree
Hide file tree
Showing 11 changed files with 501 additions and 494 deletions.
57 changes: 27 additions & 30 deletions Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ shared_spring_dependencies = proc do
end

shared_test_dependencies = proc do
gem 'rspec-rails', '~> 3.9'
gem 'rspec-rails', '~> 4.0'
gem 'shoulda-context', '~> 1.2.0'
end

Expand Down Expand Up @@ -77,7 +77,7 @@ appraise 'rails_5_1' do
gem 'bcrypt', '~> 3.1.7'
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'listen', '~> 3.0.5'
gem 'spring-watcher-listen', '~> 2.0.0'

# Database adapters
Expand All @@ -89,7 +89,7 @@ appraise 'rails_5_2' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '5.2.4.1'
gem 'rails', '5.2.4.5'
gem 'puma', '~> 3.11'
gem 'bootsnap', '>= 1.1.0', require: false
gem 'sass-rails', '~> 5.0'
Expand All @@ -99,38 +99,35 @@ appraise 'rails_5_2' do
gem 'capybara', '~> 3.1.1'
gem 'selenium-webdriver'
gem 'chromedriver-helper'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'listen', '~> 3.0.5'
gem 'spring-watcher-listen', '~> 2.0.0'

# Database adapters
gem 'pg', '~> 0.18'
gem 'sqlite3', '~> 1.3.6'
end

if Gem::Requirement.new('>= 2.5.0').
satisfied_by?(Gem::Version.new(RUBY_VERSION))
appraise 'rails_6_0' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '6.0.2.1'
gem 'puma', '~> 4.1'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'sass-rails', '>= 6'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.7'
gem 'bcrypt', '~> 3.1.7'
gem 'capybara', '>= 2.15'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'selenium-webdriver'
gem 'webdrivers'

# Other dependencies
gem 'actiontext', '~> 6.0.2.1'

# Database adapters
gem 'pg', '>= 0.18', '< 2.0'
gem 'sqlite3', '~> 1.4'
end
appraise 'rails_6_0' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '6.0.3.5'
gem 'puma', '~> 4.1'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'sass-rails', '>= 6'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.7'
gem 'bcrypt', '~> 3.1.7'
gem 'capybara', '>= 2.15'
gem 'listen', '~> 3.2.0'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'selenium-webdriver'
gem 'webdrivers'

# Other dependencies
gem 'actiontext', '~> 6.0.3.5'

# Database adapters
gem 'pg', '>= 0.18', '< 2.0'
gem 'sqlite3', '~> 1.4'
end
2 changes: 1 addition & 1 deletion gemfiles/rails_4_2.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem "rouge"
gem "yard"
gem "spring"
gem "spring-commands-rspec"
gem "rspec-rails", "~> 3.9"
gem "rspec-rails", "~> 4.0"
gem "shoulda-context", "~> 1.2.0"
gem "rails", "4.2.11.1"
gem "sass-rails", "~> 5.0"
Expand Down
117 changes: 60 additions & 57 deletions gemfiles/rails_4_2.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ GEM
rake
thor (>= 0.14.0)
arel (6.0.4)
ast (2.4.1)
bcrypt (3.1.13)
ast (2.4.2)
bcrypt (3.1.16)
builder (3.2.4)
byebug (11.1.3)
coderay (1.1.3)
Expand All @@ -56,37 +56,38 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
crass (1.0.5)
diff-lcs (1.3)
concurrent-ruby (1.1.8)
crass (1.0.6)
diff-lcs (1.4.4)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.11.3)
ffi (1.14.2)
fssm (0.2.10)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.5)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
loofah (2.4.0)
loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (1.0.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
parallel (1.19.2)
parser (2.7.1.4)
mini_portile2 (2.5.0)
minitest (5.14.4)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
pg (0.21.0)
protected_attributes (1.0.9)
Expand All @@ -97,6 +98,7 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
racc (1.5.2)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -111,7 +113,7 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
Expand All @@ -128,52 +130,53 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (4.3.0)
redcarpet (3.5.0)
regexp_parser (1.7.1)
redcarpet (3.5.1)
regexp_parser (2.1.1)
rexml (3.2.4)
rouge (3.22.0)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-expectations (3.9.0)
rouge (3.26.0)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (3.9.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
rubocop (0.89.1)
rspec-support (~> 3.10.0)
rspec-rails (4.0.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.2)
rubocop (1.10.0)
parallel (~> 1.10)
parser (>= 2.7.1.1)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 0.3.0, < 1.0)
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
parser (>= 2.7.1.4)
rubocop-packaging (0.4.0)
rubocop (~> 0.89)
rubocop-rails (2.4.1)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-packaging (0.5.1)
rubocop (>= 0.89, < 2.0)
rubocop-rails (2.9.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-progressbar (1.10.1)
rubocop (>= 0.90.0, < 2.0)
ruby-progressbar (1.11.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand All @@ -189,30 +192,30 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-context (1.2.2)
spring (2.1.0)
spring (2.1.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
thor (1.0.1)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.6)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.7.0)
unicode-display_width (2.0.0)
warnings_logger (0.1.1)
yard (0.9.20)
yard (0.9.26)
zeus (0.15.14)
method_source (>= 0.6.7)

Expand All @@ -238,7 +241,7 @@ DEPENDENCIES
redcarpet
rouge
rspec (~> 3.9)
rspec-rails (~> 3.9)
rspec-rails (~> 4.0)
rubocop
rubocop-packaging
rubocop-rails
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_0.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem "rouge"
gem "yard"
gem "spring"
gem "spring-commands-rspec"
gem "rspec-rails", "~> 3.9"
gem "rspec-rails", "~> 4.0"
gem "shoulda-context", "~> 1.2.0"
gem "rails-controller-testing", ">= 1.0.1"
gem "rails", "5.0.7.2"
Expand Down

0 comments on commit 178df49

Please sign in to comment.