Skip to content

Commit

Permalink
Upgrade to Ruby 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jonallured committed Dec 4, 2024
1 parent c8c4ad0 commit 2a40c5f
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 3.0.2
ruby 3.1.6
nodejs 18.15.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.0.2-alpine3.13
FROM ruby:3.1.6-alpine

ENV LANG C.UTF-8
ARG BUNDLE_GITHUB__COM
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "3.0.2"
ruby "3.1.6"

gem "rails", "6.1.7.7"

Expand Down Expand Up @@ -31,6 +31,7 @@ gem "haml-rails" # required for watt layouts
gem "hyperclient" # consume Gravity's v2 API
gem "jquery-rails"
gem "kaminari" # for pagination
gem "matrix"
gem "money" # for currency/money formatting
gem "neat", "1.7.2" # required for watt
gem "pg_search" # for searching within convection's database
Expand Down
43 changes: 29 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.9.0)
jwt (2.2.3)
kaminari (1.2.1)
activesupport (>= 4.1.0)
Expand All @@ -269,6 +270,8 @@ GEM
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand All @@ -282,6 +285,7 @@ GEM
net-pop
net-smtp
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
Expand Down Expand Up @@ -409,7 +413,7 @@ GEM
ffi (~> 1.0)
redcarpet (3.5.1)
redis (4.8.1)
regexp_parser (2.9.2)
regexp_parser (2.9.3)
restforce (5.3.0)
faraday (>= 0.9.0, <= 1.10.0)
faraday_middleware (>= 0.8.8, <= 2.0)
Expand Down Expand Up @@ -440,20 +444,21 @@ GEM
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.2)
rubocop (1.14.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.5.0, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.36.2)
parser (>= 3.3.1.0)
rubocop-performance (1.11.2)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-performance (1.22.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_parser (3.15.1)
Expand Down Expand Up @@ -523,9 +528,18 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
standard (1.1.1)
rubocop (= 1.14.0)
rubocop-performance (= 1.11.2)
standard (1.42.1)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.68.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.5)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.5.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.22.0)
temple (0.8.2)
thor (1.3.2)
tilt (2.4.0)
Expand Down Expand Up @@ -589,6 +603,7 @@ DEPENDENCIES
hyperclient
jquery-rails
kaminari
matrix
money
neat (= 1.7.2)
pg
Expand Down Expand Up @@ -623,7 +638,7 @@ DEPENDENCIES
yarjuf

RUBY VERSION
ruby 3.0.2p107
ruby 3.1.6p260

BUNDLED WITH
2.2.26
1 change: 1 addition & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

require "rails/all"
require_relative "../lib/jwt_middleware"
require "ostruct"

# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Expand Down

0 comments on commit 2a40c5f

Please sign in to comment.