From 7bd8ad2a7ff9b8cfd287321e63e1f1ed08ea0488 Mon Sep 17 00:00:00 2001
From: "heroku-linguist[bot]"
 <136119646+heroku-linguist[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 10:53:09 +0000
Subject: [PATCH 1/2] Update heroku/buildpacks-ruby to v3.0.0

## heroku/ruby

### Changed

- The buildpack now implements Buildpack API 0.10 instead of 0.9, and so requires `lifecycle` 0.17.x or newer. ([#283](https://github.com/heroku/buildpacks-ruby/pull/283))

### Added

- Added support for Ubuntu 24.04 (and thus Heroku-24 / `heroku/builder:24`). ([#284](https://github.com/heroku/buildpacks-ruby/pull/284))
---
 builder-20/builder.toml | 4 ++--
 builder-22/builder.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builder-20/builder.toml b/builder-20/builder.toml
index 5863b967..66cb4358 100644
--- a/builder-20/builder.toml
+++ b/builder-20/builder.toml
@@ -34,7 +34,7 @@ version = "0.19.6"
 
 [[buildpacks]]
   id = "heroku/ruby"
-  uri = "docker://docker.io/heroku/buildpack-ruby@sha256:995e2898a7a7fe1cb38ac24263d2f7d3fba1051ce170033320116a8aa81f9b21"
+  uri = "docker://docker.io/heroku/buildpack-ruby@sha256:b98b873adf2fc51dce9ae09331486cfe2f799ec233eb7128d1f5068e6e63e25a"
 
 [[buildpacks]]
   id = "heroku/scala"
@@ -64,7 +64,7 @@ version = "0.19.6"
     optional = true
   [[order.group]]
     id = "heroku/ruby"
-    version = "2.1.3"
+    version = "3.0.0"
   [[order.group]]
     id = "heroku/procfile"
     version = "3.1.1"
diff --git a/builder-22/builder.toml b/builder-22/builder.toml
index 29d8fc56..5a27e7a5 100644
--- a/builder-22/builder.toml
+++ b/builder-22/builder.toml
@@ -34,7 +34,7 @@ version = "0.19.6"
 
 [[buildpacks]]
   id = "heroku/ruby"
-  uri = "docker://docker.io/heroku/buildpack-ruby@sha256:995e2898a7a7fe1cb38ac24263d2f7d3fba1051ce170033320116a8aa81f9b21"
+  uri = "docker://docker.io/heroku/buildpack-ruby@sha256:b98b873adf2fc51dce9ae09331486cfe2f799ec233eb7128d1f5068e6e63e25a"
 
 [[buildpacks]]
   id = "heroku/scala"
@@ -64,7 +64,7 @@ version = "0.19.6"
     optional = true
   [[order.group]]
     id = "heroku/ruby"
-    version = "2.1.3"
+    version = "3.0.0"
   [[order.group]]
     id = "heroku/procfile"
     version = "3.1.1"

From 70aed6abc1402294774b79a86faf23efb62a64d5 Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Mon, 20 May 2024 12:17:45 +0100
Subject: [PATCH 2/2] Add Ruby to heroku/builder:24

---
 .github/workflows/build-test-publish.yml |  6 ++++++
 builder-24/builder.toml                  | 26 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
index 21606f46..811a2e95 100644
--- a/.github/workflows/build-test-publish.yml
+++ b/.github/workflows/build-test-publish.yml
@@ -92,6 +92,12 @@ jobs:
           - builder: builder-24
             language: node-js
             arch: arm64
+          - builder: builder-24
+            language: ruby
+            arch: amd64
+          - builder: builder-24
+            language: ruby
+            arch: arm64
     steps:
       # Checkout is needed only for the setup_docker_ci script
       - name: Checkout
diff --git a/builder-24/builder.toml b/builder-24/builder.toml
index 5e2ba830..bc40621e 100644
--- a/builder-24/builder.toml
+++ b/builder-24/builder.toml
@@ -24,6 +24,10 @@ version = "0.19.6"
   id = "heroku/python"
   uri = "docker://docker.io/heroku/buildpack-python@sha256:a64c75016e01aced71f98262eba7cdd132170f43df5281c94d624cbb1d230da2"
 
+[[buildpacks]]
+  id = "heroku/ruby"
+  uri = "docker://docker.io/heroku/buildpack-ruby@sha256:b98b873adf2fc51dce9ae09331486cfe2f799ec233eb7128d1f5068e6e63e25a"
+
 [[order]]
   [[order.group]]
     id = "heroku/python"
@@ -33,6 +37,28 @@ version = "0.19.6"
     version = "3.1.1"
     optional = true
 
+[[order]]
+  [[order.group]]
+    id = "heroku/nodejs-engine"
+    version = "3.2.1"
+    optional = true
+  [[order.group]]
+    id = "heroku/nodejs-yarn"
+    version = "3.2.1"
+    optional = true
+  # TODO: Enable once `heroku/jvm` supports Heroku-24.
+  # [[order.group]]
+  #   id = "heroku/jvm"
+  #   version = "TBD"
+  #   optional = true
+  [[order.group]]
+    id = "heroku/ruby"
+    version = "3.0.0"
+  [[order.group]]
+    id = "heroku/procfile"
+    version = "3.1.1"
+    optional = true
+
 [[order]]
   [[order.group]]
     id = "heroku/nodejs"