Skip to content

Drop jdk11, add jdk21 #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2024
Merged

Drop jdk11, add jdk21 #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d0ea30
Drop jdk11, add jdk21
ddworak May 6, 2024
d461f2c
Simplify ComponentsExample JDK usage
ddworak May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion core/jvm/src/test/scala/com/avsystem/commons/di/ComponentsExample.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion project/Commons.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down