Skip to content

Commit

Permalink
Update Ruby to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
glacials committed Dec 22, 2024
1 parent 20ee793 commit 513cc57
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require: rubocop-rails
Layout/LineLength:
Max: 120
AllCops:
TargetRubyVersion: "3.0.7" # Also update docker-compose.yml, docker-compose-production.yml, and Gemfile
TargetRubyVersion: "3.1.0" # Also update docker-compose.yml, docker-compose-production.yml, and Gemfile
Include:
- "**/*.rb"
- Rakefile
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source "https://rubygems.org"
ruby "3.0.7" # also update docker-compose.yml, docker-compose-production.yml, & .rubocop.yml
ruby "3.1.0" # also update docker-compose.yml, docker-compose-production.yml, & .rubocop.yml

git_source(:github) { |repo| "https://github.com/#{repo}.git" }

Expand Down Expand Up @@ -88,7 +88,7 @@ gem "pg_search"
gem "strong_migrations"

# errors+logging
gem "newrelic_rpm", "~> 6.12"
gem "newrelic_rpm"
gem "skylight", "~> 5.0.0.beta4"

# external communication
Expand Down Expand Up @@ -127,7 +127,7 @@ gem "kaminari"
gem "purecss-rails", github: "glacials/purecss-rails"
gem "sassc-rails"
gem "slim"
gem "webpacker", ">= 4.0.x"
gem "webpacker"

# workers/jobs
gem "daemons"
Expand Down
30 changes: 15 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ GEM
doorkeeper (5.6.6)
railties (>= 5)
drb (2.2.1)
erubi (1.13.0)
erubi (1.13.1)
et-orbi (1.2.4)
tzinfo
execjs (2.7.0)
Expand Down Expand Up @@ -271,7 +271,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1)
loofah (2.22.0)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -288,8 +288,8 @@ GEM
mini_histogram (0.3.1)
mini_magick (4.11.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
mini_portile2 (2.8.8)
minitest (5.25.4)
momentjs-rails (2.20.1)
railties (>= 3.1)
moving_average (0.1.1)
Expand All @@ -310,9 +310,9 @@ GEM
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
newrelic_rpm (6.15.0)
newrelic_rpm (9.16.1)
nio4r (2.7.3)
nokogiri (1.16.7)
nokogiri (1.17.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oauth2 (1.4.4)
Expand Down Expand Up @@ -363,7 +363,7 @@ GEM
rack (>= 1.2.0)
rack-protection (3.0.6)
rack
rack-proxy (0.6.5)
rack-proxy (0.7.7)
rack
rack-test (2.1.0)
rack (>= 1.3)
Expand Down Expand Up @@ -395,9 +395,9 @@ GEM
activesupport (>= 4.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.6.0)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (~> 1.14)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails_real_favicon (0.1.1)
json (>= 1.7, < 3)
rails
Expand Down Expand Up @@ -482,7 +482,7 @@ GEM
sprockets-rails
tilt
selectize-rails (0.12.6)
semantic_range (2.3.0)
semantic_range (3.1.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -525,7 +525,7 @@ GEM
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
webpacker (5.1.1)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand Down Expand Up @@ -577,7 +577,7 @@ DEPENDENCIES
listen
memory_profiler
moving_average
newrelic_rpm (~> 6.12)
newrelic_rpm
oj
omniauth
omniauth-google-oauth2
Expand Down Expand Up @@ -613,12 +613,12 @@ DEPENDENCIES
strong_migrations
syntax_suggest
tzinfo-data
webpacker (>= 4.0.x)
webpacker
webrick
websocket-driver!

RUBY VERSION
ruby 3.0.7p220
ruby 3.1.0p0

BUNDLED WITH
2.2.33
2.6.1
6 changes: 6 additions & 0 deletions config/initializers/psych.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# From https://stackoverflow.com/a/71192990/392225
module YAML
class << self
alias_method :load, :unsafe_load if YAML.respond_to? :unsafe_load
end
end
2 changes: 1 addition & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
t.string "content_type"
t.text "metadata"
t.bigint "byte_size", null: false
t.string "checksum"
t.string "checksum", null: false
t.datetime "created_at", null: false
t.string "service_name", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ x-app: &app
cache_from:
- "${REPOSITORY_URI:-splitsio}:latest"
args:
RUBY_VERSION: "3.0.7" # also update docker-compose.yml, Gemfile, and .rubocop.yml
RUBY_VERSION: "3.1.0" # also update docker-compose.yml, Gemfile, and .rubocop.yml
environment: *server-environment
image: splitsio
logging: *default-logging
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ x-app: &app
context: .
dockerfile: Dockerfile
args:
RUBY_VERSION: "3.0.7" # also update docker-compose-production.yml, Gemfile, and .rubocop.yml
RUBY_VERSION: "3.1.0" # also update docker-compose-production.yml, Gemfile, and .rubocop.yml
image: splitsio
tmpfs:
- /tmp
Expand Down

0 comments on commit 513cc57

Please sign in to comment.