From dd64af6cbecefa4f42013dd5e0eeeace07b109ff Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sat, 9 Nov 2024 18:14:55 +0000
Subject: [PATCH 1/3] Update to Ruby 3.3.6.

---
 .devcontainer/devcontainer.json | 2 +-
 Dockerfile                      | 2 +-
 Gemfile                         | 2 +-
 Gemfile.lock                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a4aad032..668af671 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,7 +14,7 @@
             "version": "latest"
         },
         "ghcr.io/devcontainers/features/ruby:1": {
-            "version": "3.1" // Change to match Ruby version from Gemfile
+            "version": "3.3.6" // Change to match Ruby version from Gemfile
         },
         "ghcr.io/devcontainers/features/node:1": {
             "version": 19 // Change Node version as required
diff --git a/Dockerfile b/Dockerfile
index 8d36d528..7b70b558 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Inspired by https://dennmart.com/articles/building-lean-docker-images-for-rails-apps/
 
 #####################################################################
-FROM ruby:3.2.3-alpine3.19 AS build
+FROM ruby:3.3.6-alpine3.20 AS build
 
 RUN apk -U upgrade && apk add --no-cache gcompat postgresql-client build-base libpq-dev tzdata \
   && rm -rf /var/cache/apk/*
diff --git a/Gemfile b/Gemfile
index f90d5d83..eea10160 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '~> 3.1'
+ruby '~> 3.3.6'
 
 # Gems that have trouble with native packages on alpine.
 gem 'google-protobuf', force_ruby_platform: true
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f6b1e41..f61aa42a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -592,7 +592,7 @@ DEPENDENCIES
   tzinfo-data
 
 RUBY VERSION
-   ruby 3.1.4p223
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.3.26

From e3e25afa415a514317b55a60f6b7e69becb66b3a Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sat, 9 Nov 2024 18:20:25 +0000
Subject: [PATCH 2/3] Update ruby version in github CI file as well.

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98aa6a3c..b8160497 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3.6
           bundler-cache: true
 
       - name: Set up Rails

From 085c83778c5d7cb6262c301b20422c0c189a9f5a Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sat, 9 Nov 2024 18:24:24 +0000
Subject: [PATCH 3/3] Update ruby version in *both places* in the github ci
 file.

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8160497..f0948bbd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.3.6
           bundler-cache: true
       - name: Security audit dependencies
         run: bundle exec bundler-audit --update