Commit 398e47f 1 parent c1b2593 commit 398e47f Copy full SHA for 398e47f
File tree 4 files changed +11
-12
lines changed
4 files changed +11
-12
lines changed Original file line number Diff line number Diff line change 1
- # [Choice] Java version: 11, 15
2
- ARG VARIANT=11
1
+ ARG VARIANT=21
3
2
FROM mcr.microsoft.com/vscode/devcontainers/java:${VARIANT}
4
3
5
4
# [Option] Install Maven
Original file line number Diff line number Diff line change 3
3
"build" : {
4
4
"dockerfile" : "Dockerfile" ,
5
5
"args" : {
6
- // Update the VARIANT arg to pick a Java version: 11, 15
7
- "VARIANT" : "11" ,
6
+ "VARIANT" : "21" ,
8
7
// Options
9
8
"INSTALL_MAVEN" : "false" ,
10
9
"INSTALL_GRADLE" : "false" ,
Original file line number Diff line number Diff line change @@ -15,19 +15,19 @@ jobs:
15
15
runs-on : ubuntu-latest
16
16
17
17
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
21
21
with :
22
- java-version : ' 11 '
22
+ java-version : ' 21 '
23
23
distribution : ' temurin'
24
24
cache : ' sbt'
25
25
26
26
- name : Run tests and create coverage report
27
27
run : sbt clean coverage test assembly coverageReport
28
28
29
29
- name : Upload coverage report
30
- uses : actions/upload-artifact@v3
30
+ uses : actions/upload-artifact@v4
31
31
with :
32
32
name : scoverage-report
33
- path : target/scala-2.13 /scoverage-report/
33
+ path : target/scala-* /scoverage-report/
Original file line number Diff line number Diff line change @@ -16,12 +16,13 @@ enablePlugins(DockerPlugin)
16
16
Docker / packageName := " sample-webapp"
17
17
Docker / version := " 2.0.0"
18
18
19
- dockerBaseImage := " openjdk :latest"
19
+ dockerBaseImage := " eclipse-temurin :latest"
20
20
dockerExposedPorts := List (8080 )
21
21
22
22
assembly / mainClass := Some (" Main" )
23
23
ThisBuild / assemblyMergeStrategy := {
24
- case " module-info.class" => MergeStrategy .discard
24
+ case PathList (ps @ _* ) if ps.last endsWith " module-info.class" =>
25
+ MergeStrategy .discard
25
26
case x =>
26
27
val oldStrategy = (assembly / assemblyMergeStrategy).value
27
28
oldStrategy(x)
You can’t perform that action at this time.
0 commit comments