Skip to content

Commit 398e47f

Browse files
committed
Update actions/checkout to v4
Update actions/setup-java to v4 Update actions/upload-artifact to v4 Update Java to 21
1 parent c1b2593 commit 398e47f

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

.devcontainer/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# [Choice] Java version: 11, 15
2-
ARG VARIANT=11
1+
ARG VARIANT=21
32
FROM mcr.microsoft.com/vscode/devcontainers/java:${VARIANT}
43

54
# [Option] Install Maven

.devcontainer/devcontainer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
// Update the VARIANT arg to pick a Java version: 11, 15
7-
"VARIANT": "11",
6+
"VARIANT": "21",
87
// Options
98
"INSTALL_MAVEN": "false",
109
"INSTALL_GRADLE": "false",

.github/workflows/Test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- name: Set up JDK 11
20-
uses: actions/setup-java@v3
18+
- uses: actions/checkout@v4
19+
- name: Set up JDK 21
20+
uses: actions/setup-java@v4
2121
with:
22-
java-version: '11'
22+
java-version: '21'
2323
distribution: 'temurin'
2424
cache: 'sbt'
2525

2626
- name: Run tests and create coverage report
2727
run: sbt clean coverage test assembly coverageReport
2828

2929
- name: Upload coverage report
30-
uses: actions/upload-artifact@v3
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: scoverage-report
33-
path: target/scala-2.13/scoverage-report/
33+
path: target/scala-*/scoverage-report/

build.sbt

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ enablePlugins(DockerPlugin)
1616
Docker / packageName := "sample-webapp"
1717
Docker / version := "2.0.0"
1818

19-
dockerBaseImage := "openjdk:latest"
19+
dockerBaseImage := "eclipse-temurin:latest"
2020
dockerExposedPorts := List(8080)
2121

2222
assembly / mainClass := Some("Main")
2323
ThisBuild / assemblyMergeStrategy := {
24-
case "module-info.class" => MergeStrategy.discard
24+
case PathList(ps @ _*) if ps.last endsWith "module-info.class" =>
25+
MergeStrategy.discard
2526
case x =>
2627
val oldStrategy = (assembly / assemblyMergeStrategy).value
2728
oldStrategy(x)

0 commit comments

Comments
 (0)