From a56e98cef2bbafb08aaec1d21c4d8c936d37ed63 Mon Sep 17 00:00:00 2001 From: Malaber Date: Sun, 15 Aug 2021 14:07:42 +0200 Subject: [PATCH] Update ruby to 2.7.1 not because this is the newest, but because it currently runs on my machine. Rbenv refuses to behave. --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 307 +++++++++++++++++------------------ docker/production/Dockerfile | 2 +- 4 files changed, 155 insertions(+), 158 deletions(-) diff --git a/.ruby-version b/.ruby-version index 57cf282..860487c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.7.1 diff --git a/Gemfile b/Gemfile index 53ceb89..02da70e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.5' +ruby '2.7.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index 2283d18..a2fbb10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,77 +1,76 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.1) - actionpack (= 6.0.3.1) + actioncable (6.0.4) + actionpack (= 6.0.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionmailbox (6.0.4) + actionpack (= 6.0.4) + activejob (= 6.0.4) + activerecord (= 6.0.4) + activestorage (= 6.0.4) + activesupport (= 6.0.4) mail (>= 2.7.1) - actionmailer (6.0.3.1) - actionpack (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) + actionmailer (6.0.4) + actionpack (= 6.0.4) + actionview (= 6.0.4) + activejob (= 6.0.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.1) - actionview (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionpack (6.0.4) + actionview (= 6.0.4) + activesupport (= 6.0.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.1) - actionpack (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actiontext (6.0.4) + actionpack (= 6.0.4) + activerecord (= 6.0.4) + activestorage (= 6.0.4) + activesupport (= 6.0.4) nokogiri (>= 1.8.5) - actionview (6.0.3.1) - activesupport (= 6.0.3.1) + actionview (6.0.4) + activesupport (= 6.0.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_model_serializers (0.10.10) - actionpack (>= 4.1, < 6.1) - activemodel (>= 4.1, < 6.1) + active_model_serializers (0.10.12) + actionpack (>= 4.1, < 6.2) + activemodel (>= 4.1, < 6.2) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.0.3.1) - activesupport (= 6.0.3.1) + activejob (6.0.4) + activesupport (= 6.0.4) globalid (>= 0.3.6) - activemodel (6.0.3.1) - activesupport (= 6.0.3.1) - activerecord (6.0.3.1) - activemodel (= 6.0.3.1) - activesupport (= 6.0.3.1) - activestorage (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) - marcel (~> 0.3.1) - activesupport (6.0.3.1) + activemodel (6.0.4) + activesupport (= 6.0.4) + activerecord (6.0.4) + activemodel (= 6.0.4) + activesupport (= 6.0.4) + activestorage (6.0.4) + actionpack (= 6.0.4) + activejob (= 6.0.4) + activerecord (= 6.0.4) + marcel (~> 1.0.0) + activesupport (6.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - ast (2.4.0) - backport (1.1.2) - bcrypt (3.1.13) - benchmark (0.1.0) - bootsnap (1.4.6) + ast (2.4.2) + backport (0.3.0) + bcrypt (3.1.16) + bootsnap (1.7.7) msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) case_transform (0.2) activesupport - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.9) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -79,143 +78,144 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - devise (4.7.1) + devise (4.8.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise_token_auth (1.1.4) + devise_token_auth (1.2.0) bcrypt (~> 3.0) devise (> 3.5.2, < 5) - rails (>= 4.2.0, < 6.1) - sprockets (= 3.7.2) - diff-lcs (1.3) - docile (1.3.2) + rails (>= 4.2.0, < 6.2) + diff-lcs (1.4.4) + docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - e2mmap (0.1.0) - erubi (1.9.0) - factory_bot (5.2.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.2.0) - factory_bot (~> 5.2.0) - railties (>= 4.2.0) - faker (2.12.0) + erubi (1.10.0) + factory_bot (6.2.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) + railties (>= 5.0.0) + faker (2.18.0) i18n (>= 1.6, < 2) - ffi (1.13.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - http-cookie (1.0.3) + ffi (1.15.3) + globalid (0.5.2) + activesupport (>= 5.0) + htmlentities (4.3.4) + http-accept (1.7.0) + http-cookie (1.0.4) domain_name (~> 0.5) - i18n (1.8.3) + i18n (1.8.10) concurrent-ruby (~> 1.0) interactor (3.1.2) interactor-rails (2.2.1) interactor (~> 3.0) rails (>= 4.2) jaro_winkler (1.5.4) - json (2.3.0) + json (2.5.1) jsonapi-renderer (0.2.2) + kramdown (1.17.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.5.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - mailgun-ruby (1.2.0) - rest-client (~> 2.0.2) - marcel (0.3.3) - mimemagic (~> 0.3.2) - maruku (0.7.3) + mailgun-ruby (1.2.5) + rest-client (>= 2.0.2) + marcel (1.0.1) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.1) - msgpack (1.3.3) + mime-types-data (3.2021.0704) + mini_mime (1.1.0) + mini_portile2 (2.6.1) + minitest (5.14.4) + msgpack (1.4.2) netrc (0.11.0) - nio4r (2.5.2) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) + nio4r (2.5.8) + nokogiri (1.12.3) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) orm_adapter (0.5.0) - parallel (1.19.1) - parser (2.7.1.3) - ast (~> 2.4.0) + parallel (1.20.1) + parser (2.7.2.0) + ast (~> 2.4.1) pg (1.2.3) - puma (4.3.5) + puma (4.3.8) nio4r (~> 2.0) - rack (2.2.2) + racc (1.5.2) + rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) rack-test (1.1.0) rack (>= 1.0, < 3) - railroady (1.5.3) - rails (6.0.3.1) - actioncable (= 6.0.3.1) - actionmailbox (= 6.0.3.1) - actionmailer (= 6.0.3.1) - actionpack (= 6.0.3.1) - actiontext (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) - activemodel (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + railroady (1.6.0) + rails (6.0.4) + actioncable (= 6.0.4) + actionmailbox (= 6.0.4) + actionmailer (= 6.0.4) + actionpack (= 6.0.4) + actiontext (= 6.0.4) + actionview (= 6.0.4) + activejob (= 6.0.4) + activemodel (= 6.0.4) + activerecord (= 6.0.4) + activestorage (= 6.0.4) + activesupport (= 6.0.4) bundler (>= 1.3.0) - railties (= 6.0.3.1) + railties (= 6.0.4) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.1) - actionpack (= 6.0.3.1) - activesupport (= 6.0.3.1) + railties (6.0.4) + actionpack (= 6.0.4) + activesupport (= 6.0.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.6) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.7.0) + regexp_parser (2.1.1) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) - rest-client (2.0.2) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - reverse_markdown (2.0.0) + reverse_markdown (1.4.0) nokogiri - rexml (3.2.4) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rexml (3.2.5) + 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.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (4.0.1) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-support (3.9.3) + rspec-support (~> 3.10.0) + rspec-rails (5.0.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.2) rubocop (0.85.0) parallel (~> 1.10) parser (>= 2.7.0.1) @@ -225,45 +225,42 @@ GEM rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.0.3) - parser (>= 2.7.0.1) - rubocop-performance (1.6.1) - rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport - rack (>= 1.1) - rubocop (>= 0.72.0) - ruby-progressbar (1.10.1) - ruby_dep (1.5.0) - shoulda-matchers (4.3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + rubocop-performance (1.7.1) + rubocop (>= 0.82.0) + rubocop-rails (2.6.0) activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 0.82.0) + ruby-progressbar (1.11.0) + ruby_dep (1.5.0) + shoulda-matchers (5.0.0) + activesupport (>= 5.2.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - solargraph (0.39.8) - backport (~> 1.1) - benchmark - bundler (>= 1.17.2) - e2mmap + solargraph (0.31.3) + backport (~> 0.3) + htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) - maruku (~> 0.7, >= 0.7.3) - nokogiri (~> 1.9, >= 1.9.1) + kramdown (~> 1.16) parser (~> 2.3) - reverse_markdown (>= 1.0.5, < 3) + reverse_markdown (~> 1.0, >= 1.0.5) rubocop (~> 0.52) - thor (~> 1.0) + thor (~> 0.19, >= 0.19.4) tilt (~> 2.0) - yard (~> 0.9, >= 0.9.24) - spring (2.1.0) + yard (~> 0.9) + spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.0.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) @@ -271,24 +268,24 @@ GEM sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (1.0.1) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - tins (1.25.0) + tins (1.29.1) sync - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) - warden (1.2.8) - rack (>= 2.0.6) - websocket-driver (0.7.2) + warden (1.2.9) + rack (>= 2.0.9) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - yard (0.9.25) - zeitwerk (2.3.0) + yard (0.9.26) + zeitwerk (2.4.2) PLATFORMS ruby @@ -323,7 +320,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 2.6.5p114 + ruby 2.7.1p83 BUNDLED WITH 1.17.2 diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 8f79622..fc63b47 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.5-alpine +FROM ruby:2.7.1-alpine RUN apk add --no-cache build-base tzdata sqlite sqlite-dev postgresql-dev && gem install tzinfo-data WORKDIR /app COPY Gemfile* /app/