Skip to content

Commit

Permalink
Update heroku/buildpacks-jvm to v3.1.0 (#381)
Browse files Browse the repository at this point in the history
* Update heroku/buildpacks-jvm to v3.1.0

## heroku/gradle

### Added

* Initial release

## heroku/java

- Updated `heroku/procfile` to `2.0.1`. ([#568](heroku/buildpacks-jvm#568))
- Updated `heroku/gradle` to `3.1.0`.
- Updated `heroku/jvm` to `3.1.0`.
- Updated `heroku/maven` to `3.1.0`.

## heroku/java-function

- Updated `heroku/jvm-function-invoker` to `3.1.0`.
- Updated `heroku/jvm` to `3.1.0`.
- Updated `heroku/maven` to `3.1.0`.

## heroku/jvm

* Default version for **OpenJDK 11** is now `11.0.20.1`. ([#582](heroku/buildpacks-jvm#582))
* Default version for **OpenJDK 17** is now `17.0.8.1`. ([#582](heroku/buildpacks-jvm#582))

## heroku/jvm-function-invoker

- No changes.

## heroku/maven

- No changes.

## heroku/sbt

- No changes.

## heroku/scala

- Updated `heroku/procfile` to `2.0.1`. ([#568](heroku/buildpacks-jvm#568))
- Updated `heroku/jvm` to `3.1.0`.
- Updated `heroku/sbt` to `3.1.0`.

* Tweaks after Gradle CNB availability

---------

Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com>
Co-authored-by: Manuel Fuchs <[email protected]>
  • Loading branch information
heroku-linguist[bot] and Malax authored Sep 19, 2023
1 parent 21775d4 commit 270dd16
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 30 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build-test-publish.yml
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
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
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"

0 comments on commit 270dd16

Please sign in to comment.