Merge pull request #573 from AVSystem/jdk21

Drop jdk11, add jdk21
AVSystem · May 6, 2024 · fe89987 · fe89987
2 parents 74d36af + d461f2c
commit fe89987
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,28 +25,28 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.14]
-        java: [temurin@11, temurin@17]
+        java: [temurin@17, temurin@21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: sbt
 
-      - name: Setup Java (temurin@17)
-        if: matrix.java == 'temurin@17'
+      - name: Setup Java (temurin@21)
+        if: matrix.java == 'temurin@21'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: Cache Redis
@@ -83,28 +83,28 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.14]
-        java: [temurin@11]
+        java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: sbt
 
-      - name: Setup Java (temurin@17)
-        if: matrix.java == 'temurin@17'
+      - name: Setup Java (temurin@21)
+        if: matrix.java == 'temurin@21'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - env:

diff --git a/core/jvm/src/test/scala/com/avsystem/commons/di/ComponentsExample.scala b/core/jvm/src/test/scala/com/avsystem/commons/di/ComponentsExample.scala
@@ -14,7 +14,7 @@ case class BulbulatorConfig(
 )
 
 abstract class MyComponent {
-  println(s"starting $this initialization on ${Thread.currentThread().getId}")
+  println(s"starting $this initialization on ${Thread.currentThread()}")
   Thread.sleep(100)
   println(s"finished $this initialization")
 

diff --git a/project/Commons.scala b/project/Commons.scala
@@ -78,7 +78,7 @@ object Commons extends ProjectGroup("commons") {
       "REDIS_VERSION" -> "6.2.12",
     ),
     githubWorkflowArtifactUpload := false,
-    githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17")),
+    githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")),
     githubWorkflowBuildPreamble ++= Seq(
       WorkflowStep.Use(
         UseRef.Public("actions", "cache", "v2"),