From 8f98efd5cae38f5706bf91f5e883477fbc241642 Mon Sep 17 00:00:00 2001 From: Justin Cooper Date: Mon, 16 Oct 2023 11:58:32 -0500 Subject: [PATCH] update as many dependencies as possible to pull project forward --- .github/workflows/deploy.yml | 2 +- Dockerfile | 2 +- Gemfile | 17 +++-- Gemfile.lock | 139 ++++++++++++++++++----------------- docker-compose.yml | 13 ++-- 5 files changed, 91 insertions(+), 82 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 38fa661..d85c3de 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ jobs: deploy: runs-on: ubuntu-latest env: - ruby-version: 2.6.5 + ruby-version: 3.2.2 steps: - uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 04902b1..1df4e8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.5 +FROM ruby:3.2.2 COPY . /usr/src/app VOLUME /usr/src/app EXPOSE 4567 diff --git a/Gemfile b/Gemfile index 2cdec29..194e906 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,17 @@ -ruby '>= 2.6.5' +ruby '>= 3.2.2' source 'https://rubygems.org' # Middleman -gem 'ffi', '~> 1.14.2' -gem 'middleman', '~> 4.3.4' -gem 'middleman-autoprefixer', '~> 2.10.0' +gem 'ffi', '~> 1.16.3' +gem 'middleman', '~> 4.5.0' +gem 'middleman-autoprefixer', '~> 3.0.0' gem 'middleman-sprockets', '~> 4.1.1' gem 'middleman-syntax', '~> 3.2.0' -gem 'nokogiri', '~> 1.14.3' +gem 'nokogiri', '~> 1.15.4' gem 'rack', '~> 2.2.6' -gem 'redcarpet', '~> 3.5.1' -gem 'rouge', '~> 3.26.0' +gem 'redcarpet', '~> 3.6.0' +gem 'rouge', '~> 3.30.0' +# middleman-syntax won't work with haml6 +# See: https://github.com/middleman/middleman-syntax/issues/80 +gem 'haml', '< 6.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index b975f17..a288a57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,59 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.5) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - autoprefixer-rails (9.8.6.5) - execjs - backports (3.20.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + autoprefixer-rails (10.4.15.0) + execjs (~> 2) + backports (3.24.1) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) - contracts (0.13.0) - dotenv (2.7.6) + concurrent-ruby (1.2.2) + contracts (0.16.1) + dotenv (2.8.1) erubis (2.7.0) - execjs (2.7.0) - fast_blank (1.0.0) - fastimage (2.2.3) - ffi (1.14.2) - haml (5.2.1) + execjs (2.9.1) + fast_blank (1.0.1) + fastimage (2.2.7) + ffi (1.16.3) + haml (5.2.2) temple (>= 0.8.0) tilt hamster (3.0.0) concurrent-ruby (~> 1.0) hashie (3.6.0) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) memoist (0.16.2) - middleman (4.3.11) + middleman (4.5.0) coffee-script (~> 2.2) haml (>= 4.0.5) kramdown (>= 2.3.0) - middleman-cli (= 4.3.11) - middleman-core (= 4.3.11) - middleman-autoprefixer (2.10.1) - autoprefixer-rails (~> 9.1) - middleman-core (>= 3.3.3) - middleman-cli (4.3.11) + middleman-cli (= 4.5.0) + middleman-core (= 4.5.0) + middleman-autoprefixer (3.0.0) + autoprefixer-rails (~> 10.0) + middleman-core (>= 4.0.0) + middleman-cli (4.5.0) thor (>= 0.17.0, < 2.0) - middleman-core (4.3.11) - activesupport (>= 4.2, < 6.0) - addressable (~> 2.3) + middleman-core (4.5.0) + activesupport (>= 6.1, < 7.1) + addressable (~> 2.4) backports (~> 3.6) - bundler - contracts (~> 0.13.0) + bundler (~> 2.0) + contracts (~> 0.13) dotenv erubis execjs (~> 2.0) @@ -61,74 +61,79 @@ GEM fastimage (~> 2.0) hamster (~> 3.0) hashie (~> 3.4) - i18n (~> 0.9.0) - listen (~> 3.0.0) + i18n (~> 1.6.0) + listen (~> 3.0) memoist (~> 0.14) - padrino-helpers (~> 0.13.0) + padrino-helpers (~> 0.15.0) parallel rack (>= 1.4.5, < 3) sassc (~> 2.0) servolux tilt (~> 2.0.9) + toml uglifier (~> 3.0) + webrick middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) middleman-syntax (3.2.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_portile2 (2.8.1) - minitest (5.14.4) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.4) + minitest (5.20.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - padrino-helpers (0.13.3.4) - i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.13.3.4) + padrino-helpers (0.15.3) + i18n (>= 0.6.7, < 2) + padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) - padrino-support (0.13.3.4) - activesupport (>= 3.1) - parallel (1.20.1) - public_suffix (4.0.6) - racc (1.6.2) - rack (2.2.6.4) - rb-fsevent (0.10.4) + padrino-support (0.15.3) + parallel (1.23.0) + parslet (2.0.0) + public_suffix (5.0.3) + racc (1.7.1) + rack (2.2.8) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.1) - rexml (3.2.5) - rouge (3.26.0) + redcarpet (3.6.0) + rexml (3.2.6) + rouge (3.30.0) sassc (2.4.0) ffi (~> 1.9) servolux (0.13.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - temple (0.8.2) - thor (1.1.0) - thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.10) - thread_safe (~> 0.1) + temple (0.10.3) + thor (1.2.2) + tilt (2.0.11) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) + webrick (1.8.1) PLATFORMS ruby DEPENDENCIES - ffi (~> 1.14.2) - middleman (~> 4.3.4) - middleman-autoprefixer (~> 2.10.0) + ffi (~> 1.16.3) + haml (< 6.0.0) + middleman (~> 4.5.0) + middleman-autoprefixer (~> 3.0.0) middleman-sprockets (~> 4.1.1) middleman-syntax (~> 3.2.0) - nokogiri (~> 1.14.3) + nokogiri (~> 1.15.4) rack (~> 2.2.6) - redcarpet (~> 3.5.1) - rouge (~> 3.26.0) + redcarpet (~> 3.6.0) + rouge (~> 3.30.0) RUBY VERSION - ruby 2.6.5p114 + ruby 3.2.2p53 BUNDLED WITH 2.1.4 diff --git a/docker-compose.yml b/docker-compose.yml index edb6079..cfa7bf8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ -app: - build: . - ports: - - 4567:4567 - volumes: - - .:/usr/src/app \ No newline at end of file +services: + app: + build: . + ports: + - 4567:4567 + volumes: + - .:/usr/src/app