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.

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

Mise à jour vers java 17 #1870

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
java-version: '17'
- name: Formatting
run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck
- name: Scalafix
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
java-version: '17'
- uses: harmon758/postgresql-action@v1
with:
postgresql version: '10'
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN npm run build
# Builder image for the Scala app
# based on https://github.com/hseeberger/scala-sbt
#
FROM eclipse-temurin:11-jdk AS scalabuilder
FROM eclipse-temurin:17-jdk AS scalabuilder

# We need nodejs to run in a reasonable amount of time sbt-web
# see step `Optimizing JavaScript with RequireJS`
Expand Down Expand Up @@ -53,7 +53,7 @@ RUN sbt clean stage
# Final Image
#
#
FROM eclipse-temurin:11-jre
FROM eclipse-temurin:17-jre

ENV PLAY_APP_NAME aplus
ENV PLAY_APP_DIR /var/www/$PLAY_APP_NAME
Expand Down
1 change: 0 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"quantity": 1
}
},
"stack": "heroku-18",
"addons": [
"heroku-postgresql"
],
Expand Down
2 changes: 1 addition & 1 deletion system.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java.runtime.version=11
java.runtime.version=17