Skip to content

Commit

Permalink
Merge pull request #116 from govuk-one-login/ruby-upgrade
Browse files Browse the repository at this point in the history
BAU: Upgrade to Ruby v3.3.0
  • Loading branch information
huwd authored Jan 26, 2024
2 parents e3c75b7 + 03c5073 commit 109b3d0
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
3.3.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6.5-buster
FROM ruby:3.3.0-bullseye

EXPOSE 4567:4567
EXPOSE 35729:35729
Expand Down
135 changes: 69 additions & 66 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.6)
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 (10.3.3.0)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
backports (3.21.0)
backports (3.24.1)
chronic (0.10.2)
chunky_png (1.4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
commonmarker (0.23.2)
commonmarker (0.23.10)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
Expand All @@ -30,23 +30,24 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.1.9)
contracts (0.13.0)
dotenv (2.7.6)
em-websocket (0.5.2)
concurrent-ruby (1.2.3)
contracts (0.16.1)
dotenv (2.8.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
erubis (2.7.0)
ethon (0.15.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.8.1)
execjs (2.9.1)
fast_blank (1.0.1)
fastimage (2.2.5)
ffi (1.15.5)
govuk_tech_docs (3.0.0)
fastimage (2.3.0)
ffi (1.16.3)
govuk_tech_docs (3.4.0)
autoprefixer-rails (~> 10.2)
chronic (~> 0.10.2)
haml (< 6.0.0)
middleman (~> 4.0)
middleman-autoprefixer (~> 2.10.0)
middleman-compass (>= 4.0.0)
Expand All @@ -71,58 +72,60 @@ GEM
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
http_parser.rb (0.8.0)
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)
mercenary (0.4.0)
middleman (4.3.11)
middleman (4.5.1)
coffee-script (~> 2.2)
haml (>= 4.0.5)
kramdown (>= 2.3.0)
middleman-cli (= 4.3.11)
middleman-core (= 4.3.11)
middleman-cli (= 4.5.1)
middleman-core (= 4.5.1)
middleman-autoprefixer (2.10.0)
autoprefixer-rails (>= 9.1.4)
middleman-core (>= 3.3.3)
middleman-cli (4.3.11)
thor (>= 0.17.0, < 2.0)
middleman-cli (4.5.1)
thor (>= 0.17.0, < 1.3.0)
middleman-compass (4.0.1)
compass (>= 1.0.0, < 2.0.0)
middleman-core (>= 4.0.0)
middleman-core (4.3.11)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
middleman-core (4.5.1)
activesupport (>= 6.1, < 7.1)
addressable (~> 2.4)
backports (~> 3.6)
bundler
contracts (~> 0.13.0)
bundler (~> 2.0)
contracts (~> 0.13, < 0.17)
dotenv
erubis
execjs (~> 2.0)
fast_blank
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-livereload (3.4.7)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-search-gds (0.11.1)
middleman-search-gds (0.11.2)
execjs (~> 2.6)
middleman-core (>= 3.2)
nokogiri (~> 1.6)
Expand All @@ -132,52 +135,52 @@ GEM
middleman-syntax (3.2.0)
middleman-core (>= 3.2)
rouge (~> 3.2)
mini_portile2 (2.8.0)
minitest (5.14.4)
mini_portile2 (2.8.5)
minitest (5.21.2)
multi_json (1.15.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
nokogiri (1.16.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
openapi3_parser (0.9.0)
openapi3_parser (0.9.2)
commonmarker (~> 0.17)
psych (~> 3.1)
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.21.0)
psych (3.3.2)
public_suffix (4.0.6)
racc (1.6.0)
rack (2.2.3)
padrino-support (0.15.3)
parallel (1.24.0)
parslet (2.0.0)
public_suffix (5.0.4)
racc (1.7.3)
rack (2.2.8)
rack-livereload (0.3.17)
rack
rainbow (3.1.1)
rb-fsevent (0.11.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.5.1)
rexml (3.2.5)
rouge (3.26.1)
rexml (3.2.6)
rouge (3.30.0)
sass (3.4.25)
sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
sprockets (4.0.2)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
temple (0.8.2)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
rack (>= 2.2.4, < 4)
temple (0.10.3)
thor (1.2.2)
tilt (2.0.11)
toml (0.3.0)
parslet (>= 1.8.0, < 3.0.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
webrick (1.8.1)
yell (2.2.2)

PLATFORMS
Expand All @@ -190,4 +193,4 @@ DEPENDENCIES
wdm (~> 0.1.0)

BUNDLED WITH
1.17.2
2.5.4

0 comments on commit 109b3d0

Please sign in to comment.