Skip to content

Commit

Permalink
Merge pull request anycable#16 from anycable/versions-upgrade
Browse files Browse the repository at this point in the history
Upgrade Ruby, Rails, Redis, and (sure) AnyCable to latest versions
  • Loading branch information
palkan authored Apr 28, 2020
2 parents 3b253d3 + 93f95ce commit e646f07
Show file tree
Hide file tree
Showing 9 changed files with 240 additions and 217 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.1
FROM ruby:2.6.5

RUN apt-get update && apt-get install -y build-essential
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
Expand Down
19 changes: 10 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1'
gem 'rails', '~> 6.0'
# Use sqlite3
gem 'sqlite3', group: [:development, :test]
gem 'sqlite3', '~> 1.4', group: [:development, :test]
gem 'pg', group: :production

# Use Puma as the app server
gem 'puma', '~> 3.12'
gem 'puma', '~> 4.0'

gem 'sass-rails', '~> 5.0'
gem 'sass-rails'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2.0'
gem 'coffee-rails'
gem 'slim-rails'
gem 'autoprefixer-rails'
gem 'csso-rails'
Expand All @@ -32,10 +32,11 @@ if ENV["LOCAL_CABLE"]
gem 'anycable', path: '../anycable'
gem 'anycable-rails', path: '../anycable-rails'
else
gem 'anycable-rails', '~> 0.6.2'
gem 'anycable-rails', '1.0.0.preview2'
end

gem 'anycable-rack-server', require: ENV["ANYCABLE_RACK"] ? "anycable-rack-server" : false
# Not support by 1.0.0 yet
# gem 'anycable-rack-server', require: ENV["ANYCABLE_RACK"] ? "anycable-rack-server" : false

gem 'yabeda'

Expand All @@ -47,7 +48,7 @@ gem 'tzinfo-data'

gem 'active_model_serializers'

gem 'factory_girl_rails', '~> 4.0'
gem 'factory_bot_rails', '~> 4.0'

gem "faker", "~> 1.8.4"

Expand All @@ -72,7 +73,7 @@ end

group :test do
# RSpec tools
gem 'rspec-rails', '~> 3.5.0'
gem 'rspec-rails', '~> 3.9.0'
gem "rspec_junit_formatter" # For CircleCI reports
gem 'capybara'
gem 'fuubar'
Expand Down
Loading

0 comments on commit e646f07

Please sign in to comment.