Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.3.14"
ruby-version: "4.0.10"

- name: Setup Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.3.14
ruby-4.0.10
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 3.3.14
ruby 4.0.10
nodejs 26.13.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG DISTRO_NAME=bullseye
ARG RUBY_VERSION=3.3.14
ARG RUBY_VERSION=4.0.10

FROM ruby:$RUBY_VERSION-slim-$DISTRO_NAME

Expand Down
11 changes: 9 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.3.14"
ruby "4.0.10"

def next?
File.basename(__FILE__) == "Gemfile.next"
end

gem "next_rails"

# Removed from default gems in Ruby 3.4+/4.0
gem "csv"
gem "mutex_m"
gem "nkf"
gem "observer"
gem "ostruct"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
if next?
gem "rails", github: "rails/rails", branch: "main"
Expand All @@ -25,7 +32,7 @@ gem "ombu_labs-auth"

# The modern asset pipeline for Rails [https://github.com/rails/propshaft]
gem "propshaft"
gem "tailwindcss-rails"
gem "tailwindcss-rails", "~> 3.3"

# Use postgresql as the database for Active Record
gem "pg", "~> 1.1"
Expand Down
76 changes: 58 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
anonymous_loader (0.1.5)
version_gem (~> 1.1, >= 1.1.17)
ast (2.4.2)
ast (2.4.3)
auth-sanitizer (0.2.5)
version_gem (~> 1.1, >= 1.1.16)
base64 (0.3.0)
Expand All @@ -105,6 +105,7 @@ GEM
crass (1.0.8)
cssbundling-rails (1.1.1)
railties (>= 6.0.0)
csv (3.3.7)
date (3.6.0)
debug (1.6.2)
irb (>= 1.3.6)
Expand All @@ -126,6 +127,35 @@ GEM
dotenv_validator (1.2.0)
fast_blank (~> 1.0.0)
drb (2.2.3)
dry-configurable (1.4.0)
dry-core (~> 1.0)
zeitwerk (~> 2.6)
dry-core (1.2.0)
concurrent-ruby (~> 1.0)
logger
zeitwerk (~> 2.6)
dry-inflector (1.3.1)
dry-initializer (3.2.0)
dry-logic (1.6.0)
bigdecimal
concurrent-ruby (~> 1.0)
dry-core (~> 1.1)
zeitwerk (~> 2.6)
dry-schema (1.17.0)
concurrent-ruby (~> 1.0)
dry-configurable (~> 1.0, >= 1.0.1)
dry-core (~> 1.1)
dry-initializer (~> 3.2)
dry-logic (~> 1.6)
dry-types (~> 1.9, >= 1.9.1)
zeitwerk (~> 2.6)
dry-types (1.9.2)
bigdecimal (>= 3.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
dry-inflector (~> 1.0)
dry-logic (~> 1.4)
zeitwerk (~> 2.6)
erb (6.0.7)
erubi (1.13.1)
ethon (0.19.2)
Expand Down Expand Up @@ -182,10 +212,9 @@ GEM
reline (>= 0.4.2)
jsbundling-rails (1.0.3)
railties (>= 6.0.0)
json (2.6.2)
json (2.21.2)
jwt (3.3.0)
base64
kwalify (0.7.2)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -224,6 +253,7 @@ GEM
msgpack (1.6.0)
multi_xml (0.9.1)
bigdecimal (>= 3.1, < 5)
mutex_m (0.3.0)
nenv (0.3.0)
net-http (0.10.0)
net-protocol (>= 0.3.0)
Expand All @@ -242,6 +272,7 @@ GEM
net-protocol
next_rails (1.7.0)
nio4r (2.7.5)
nkf (0.3.0)
nokogiri (1.19.7-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.7-arm64-darwin)
Expand All @@ -263,6 +294,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0, >= 2.0.9)
version_gem (~> 1.1, >= 1.1.17)
observer (0.1.2)
ombu_labs-auth (1.2.0)
devise (>= 4.9)
omniauth (~> 2.1.0)
Expand Down Expand Up @@ -292,14 +324,16 @@ GEM
actionpack (>= 4.2)
omniauth (~> 2.0)
orm_adapter (0.5.0)
ostruct (0.6.3)
overcommit (0.57.0)
childprocess (>= 0.6.3, < 5)
iniparse (~> 1.4)
pagy (5.10.1)
activesupport
parallel (1.22.1)
parser (3.1.2.1)
parser (3.3.14.0)
ast (~> 2.4.1)
racc
pg (1.4.3)
pp (0.6.4)
prettyprint
Expand Down Expand Up @@ -381,10 +415,12 @@ GEM
tsort
rebrandly (0.1.5)
httparty (~> 0.14)
reek (6.1.1)
kwalify (~> 0.7.0)
parser (~> 3.1.0)
rainbow (>= 2.0, < 4.0)
reek (6.6.0)
dry-schema (~> 1.13)
logger (~> 1.6)
parser (~> 3.3.0)
rainbow (~> 3.0)
rexml (~> 3.1)
regexp_parser (2.6.0)
reline (0.7.0)
io-console (~> 0.5)
Expand Down Expand Up @@ -461,14 +497,13 @@ GEM
rubocop-performance (= 1.14.3)
stimulus-rails (1.1.0)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-aarch64-linux)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-x86_64-linux)
railties (>= 6.0.0)
tailwindcss-rails (3.3.2)
railties (>= 7.0.0)
tailwindcss-ruby (~> 3.0)
tailwindcss-ruby (3.4.19-aarch64-linux)
tailwindcss-ruby (3.4.19-arm64-darwin)
tailwindcss-ruby (3.4.19-x86_64-darwin)
tailwindcss-ruby (3.4.19-x86_64-linux)
thor (1.5.0)
timeout (0.6.1)
tsort (0.2.0)
Expand Down Expand Up @@ -519,16 +554,21 @@ DEPENDENCIES
bootsnap
capybara (>= 2.15)
cssbundling-rails
csv
debug
dotenv-rails
dotenv_validator
factory_bot_rails
guard-rspec
jsbundling-rails
mechanize
mutex_m
next_rails
nkf
observer
ombu_labs-auth
ombu_labs-shortener
ostruct
overcommit (= 0.57.0)
pagy
pg (~> 1.1)
Expand All @@ -545,13 +585,13 @@ DEPENDENCIES
sitemap-parser
standard
stimulus-rails
tailwindcss-rails
tailwindcss-rails (~> 3.3)
tzinfo-data
web-console
webdrivers

RUBY VERSION
ruby 3.3.14p208
ruby 4.0.10p0

BUNDLED WITH
2.5.22
29 changes: 19 additions & 10 deletions Gemfile.next.lock
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ GEM
crass (1.0.8)
cssbundling-rails (1.1.1)
railties (>= 6.0.0)
csv (3.3.7)
date (3.6.0)
debug (1.6.2)
irb (>= 1.3.6)
Expand Down Expand Up @@ -273,6 +274,7 @@ GEM
msgpack (1.6.0)
multi_xml (0.9.1)
bigdecimal (>= 3.1, < 5)
mutex_m (0.3.0)
nenv (0.3.0)
net-http (0.10.0)
net-protocol (>= 0.3.0)
Expand All @@ -291,6 +293,7 @@ GEM
net-protocol
next_rails (1.7.0)
nio4r (2.7.5)
nkf (0.3.0)
nokogiri (1.19.7-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.7-arm64-darwin)
Expand All @@ -312,6 +315,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0, >= 2.0.9)
version_gem (~> 1.1, >= 1.1.17)
observer (0.1.2)
ombu_labs-auth (1.2.0)
devise (>= 4.9)
omniauth (~> 2.1.0)
Expand Down Expand Up @@ -341,6 +345,7 @@ GEM
actionpack (>= 4.2)
omniauth (~> 2.0)
orm_adapter (0.5.0)
ostruct (0.6.3)
overcommit (0.57.0)
childprocess (>= 0.6.3, < 5)
iniparse (~> 1.4)
Expand Down Expand Up @@ -484,14 +489,13 @@ GEM
stimulus-rails (1.1.0)
railties (>= 6.0.0)
stringio (3.2.0)
tailwindcss-rails (2.0.16-aarch64-linux)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.16-x86_64-linux)
railties (>= 6.0.0)
tailwindcss-rails (3.3.2)
railties (>= 7.0.0)
tailwindcss-ruby (~> 3.0)
tailwindcss-ruby (3.4.19-aarch64-linux)
tailwindcss-ruby (3.4.19-arm64-darwin)
tailwindcss-ruby (3.4.19-x86_64-darwin)
tailwindcss-ruby (3.4.19-x86_64-linux)
thor (1.5.0)
timeout (0.6.1)
tsort (0.2.0)
Expand Down Expand Up @@ -542,16 +546,21 @@ DEPENDENCIES
bootsnap
capybara (>= 2.15)
cssbundling-rails
csv
debug
dotenv-rails
dotenv_validator
factory_bot_rails
guard-rspec
jsbundling-rails
mechanize
mutex_m
next_rails
nkf
observer
ombu_labs-auth
ombu_labs-shortener
ostruct
overcommit (= 0.57.0)
pagy
pg (~> 1.1)
Expand All @@ -568,13 +577,13 @@ DEPENDENCIES
sitemap-parser
standard
stimulus-rails
tailwindcss-rails
tailwindcss-rails (~> 3.3)
tzinfo-data
web-console
webdrivers

RUBY VERSION
ruby 3.3.14p208
ruby 4.0.10p0

BUNDLED WITH
2.5.22
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
build:
context: .
args:
RUBY_VERSION: '3.3.14'
RUBY_VERSION: '4.0.10'
PG_MAJOR: '14'
NODE_MAJOR: '16'
YARN_VERSION: '1.22.17'
Expand Down
Loading