From 166c3443b0da01c55381c1dcc8a33e3b07f2fa58 Mon Sep 17 00:00:00 2001
From: Manuel Fuchs <manuel.fuchs@salesforce.com>
Date: Tue, 19 Sep 2023 10:27:14 +0200
Subject: [PATCH] Tweaks after Gradle CNB availability

---
 .github/workflows/build-test-publish.yml |  3 ---
 buildpacks-20/builder.toml               | 18 ------------------
 2 files changed, 21 deletions(-)

diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
index 3d29a752..5c93f0e3 100644
--- a/.github/workflows/build-test-publish.yml
+++ b/.github/workflows/build-test-publish.yml
@@ -54,9 +54,6 @@ jobs:
         include:
           - builder: builder-classic-22
             language: clojure
-        exclude:
-          - builder: builder-22
-            language: gradle
     steps:
       - name: Checkout getting started guide
         uses: actions/checkout@v3
diff --git a/buildpacks-20/builder.toml b/buildpacks-20/builder.toml
index 8b02a52b..ecf19359 100644
--- a/buildpacks-20/builder.toml
+++ b/buildpacks-20/builder.toml
@@ -103,21 +103,3 @@ version = "0.17.0"
   [[order.group]]
     id = "heroku/java"
     version = "3.1.0"
-
-# heroku/java previously supported Gradle by mixing in the shimmed heroku/gradle buildpack. When we decided to make a
-# clean cut and not have shimmed buildpacks in the CNB repository, support for Gradle in heroku/java was dropped.
-# To maintain backwards compatibility, we have this order definition here that mirrors what was in heroku/java
-# previously. It can be removed when the heroku/java CNB supports Gradle again.
-[[order]]
-  [[order.group]]
-    id = "heroku/jvm"
-    version = "3.1.0"
-
-  [[order.group]]
-    id = "heroku/gradle"
-    version = "0.0.0"
-
-  [[order.group]]
-    id = "heroku/procfile"
-    version = "2.0.1"
-    optional = true