From 3d0ea3028d8c57ac901ebbc99e9450d2bd45a7a1 Mon Sep 17 00:00:00 2001
From: Dawid Dworak <dawid.dworak@gmail.com>
Date: Mon, 6 May 2024 09:59:17 +0200
Subject: [PATCH 1/2] Drop jdk11, add jdk21

---
 .github/workflows/ci.yml | 28 ++++++++++++++--------------
 project/Commons.scala    |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a93721345..51e9a7f88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ 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)
@@ -33,20 +33,20 @@ jobs:
         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,7 +83,7 @@ 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)
@@ -91,20 +91,20 @@ jobs:
         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/project/Commons.scala b/project/Commons.scala
index 4f44a5142..1357a5ee8 100644
--- 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"),

From d461f2c71cf1a116cfc64a21d6dc0bb25e3fba36 Mon Sep 17 00:00:00 2001
From: Dawid Dworak <dawid.dworak@gmail.com>
Date: Mon, 6 May 2024 10:08:31 +0200
Subject: [PATCH 2/2] Simplify ComponentsExample JDK usage

---
 .../test/scala/com/avsystem/commons/di/ComponentsExample.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 1ed11642f..7dc5f9025 100644
--- 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")