Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update heroku/buildpacks-jvm to v3.1.0 #381

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Update heroku/buildpacks-jvm to v3.1.0 #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0ec832
Update heroku/buildpacks-jvm to v3.1.0
heroku-linguist[bot] Sep 18, 2023
166c344
Tweaks after Gradle CNB availability
Malax Sep 19, 2023
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
3 changes: 0 additions & 3 deletions .github/workflows/build-test-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions builder-22/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ version = "0.17.0"

[[buildpacks]]
id = "heroku/java"
uri = "docker://docker.io/heroku/buildpack-java@sha256:7e4a2bc5f80e6892949117e3ae48ecac0b54760058999c48a5907a56268949fe"
uri = "docker://docker.io/heroku/buildpack-java@sha256:01ee978c56689f0ea53b35d07469a3f66a8511e1c44f13e147dea1351cbe80d5"

[[buildpacks]]
id = "heroku/java-function"
uri = "docker://docker.io/heroku/buildpack-java-function@sha256:5025f31347af8d3642701ab416c3f1c5278775538f2d8e3d82ed1e03ea3de533"
uri = "docker://docker.io/heroku/buildpack-java-function@sha256:ad2473a262fc8e203772dd3b9bf3df897e8d1f127999110a4e31d593be3c37dc"

[[buildpacks]]
id = "heroku/scala"
uri = "docker://docker.io/heroku/buildpack-scala@sha256:5210d085d5b39e196fe7e0f8463fb06f96dc2e007ae985e11e92059a1e3b1183"
uri = "docker://docker.io/heroku/buildpack-scala@sha256:29f07ab589057a21cb2cd8628a8b56ffe76a9084f9cdaabe338468c27e23a372"

[[buildpacks]]
id = "heroku/go"
Expand Down Expand Up @@ -68,7 +68,7 @@ version = "0.17.0"
optional = true
[[order.group]]
id = "heroku/jvm"
version = "3.0.0"
version = "3.1.0"
optional = true
[[order.group]]
id = "heroku/ruby"
Expand All @@ -91,17 +91,17 @@ version = "0.17.0"
[[order]]
[[order.group]]
id = "heroku/java-function"
version = "3.0.0"
version = "3.1.0"

[[order]]
[[order.group]]
id = "heroku/java"
version = "3.0.0"
version = "3.1.0"

[[order]]
[[order.group]]
id = "heroku/scala"
version = "3.0.0"
version = "3.1.0"

[[order]]
[[order.group]]
Expand Down
22 changes: 2 additions & 20 deletions buildpacks-20/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.17.0"

[[buildpacks]]
id = "heroku/java"
uri = "docker://docker.io/heroku/buildpack-java@sha256:7e4a2bc5f80e6892949117e3ae48ecac0b54760058999c48a5907a56268949fe"
uri = "docker://docker.io/heroku/buildpack-java@sha256:01ee978c56689f0ea53b35d07469a3f66a8511e1c44f13e147dea1351cbe80d5"

[[buildpacks]]
id = "heroku/scala"
Expand Down Expand Up @@ -102,22 +102,4 @@ version = "0.17.0"
[[order]]
[[order.group]]
id = "heroku/java"
version = "3.0.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.0.0"

[[order.group]]
id = "heroku/gradle"
version = "0.0.0"

[[order.group]]
id = "heroku/procfile"
version = "2.0.1"
optional = true
version = "3.1.0"