Skip to content

Commit fe89987

Browse files
authored
Merge pull request #573 from AVSystem/jdk21
Drop jdk11, add jdk21
2 parents 74d36af + d461f2c commit fe89987

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.github/workflows/ci.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,28 @@ jobs:
2525
matrix:
2626
os: [ubuntu-latest]
2727
scala: [2.13.14]
28-
java: [temurin@11, temurin@17]
28+
java: [temurin@17, temurin@21]
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- name: Checkout current branch (full)
3232
uses: actions/checkout@v4
3333
with:
3434
fetch-depth: 0
3535

36-
- name: Setup Java (temurin@11)
37-
if: matrix.java == 'temurin@11'
36+
- name: Setup Java (temurin@17)
37+
if: matrix.java == 'temurin@17'
3838
uses: actions/setup-java@v4
3939
with:
4040
distribution: temurin
41-
java-version: 11
41+
java-version: 17
4242
cache: sbt
4343

44-
- name: Setup Java (temurin@17)
45-
if: matrix.java == 'temurin@17'
44+
- name: Setup Java (temurin@21)
45+
if: matrix.java == 'temurin@21'
4646
uses: actions/setup-java@v4
4747
with:
4848
distribution: temurin
49-
java-version: 17
49+
java-version: 21
5050
cache: sbt
5151

5252
- name: Cache Redis
@@ -83,28 +83,28 @@ jobs:
8383
matrix:
8484
os: [ubuntu-latest]
8585
scala: [2.13.14]
86-
java: [temurin@11]
86+
java: [temurin@17]
8787
runs-on: ${{ matrix.os }}
8888
steps:
8989
- name: Checkout current branch (full)
9090
uses: actions/checkout@v4
9191
with:
9292
fetch-depth: 0
9393

94-
- name: Setup Java (temurin@11)
95-
if: matrix.java == 'temurin@11'
94+
- name: Setup Java (temurin@17)
95+
if: matrix.java == 'temurin@17'
9696
uses: actions/setup-java@v4
9797
with:
9898
distribution: temurin
99-
java-version: 11
99+
java-version: 17
100100
cache: sbt
101101

102-
- name: Setup Java (temurin@17)
103-
if: matrix.java == 'temurin@17'
102+
- name: Setup Java (temurin@21)
103+
if: matrix.java == 'temurin@21'
104104
uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 17
107+
java-version: 21
108108
cache: sbt
109109

110110
- env:

core/jvm/src/test/scala/com/avsystem/commons/di/ComponentsExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ case class BulbulatorConfig(
1414
)
1515

1616
abstract class MyComponent {
17-
println(s"starting $this initialization on ${Thread.currentThread().getId}")
17+
println(s"starting $this initialization on ${Thread.currentThread()}")
1818
Thread.sleep(100)
1919
println(s"finished $this initialization")
2020

project/Commons.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ object Commons extends ProjectGroup("commons") {
7878
"REDIS_VERSION" -> "6.2.12",
7979
),
8080
githubWorkflowArtifactUpload := false,
81-
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17")),
81+
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")),
8282
githubWorkflowBuildPreamble ++= Seq(
8383
WorkflowStep.Use(
8484
UseRef.Public("actions", "cache", "v2"),

0 commit comments

Comments
 (0)