Merge branch 'master' into update/guava-33.3.1-jre

max-leuthaeuser · Sep 24, 2024 · 6d6bd91 · 6d6bd91
2 parents 9d1d5e4 + aa83051
commit 6d6bd91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -7,14 +7,14 @@ jobs:
       matrix:
         os: [ubuntu-22.04, windows-2022, macos-12]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'sbt'
       - name: Compile and run tests
         run: sbt "clean; test;"

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ trait Dependencies {
     val scalaVersion     = "3.5.1"
     val akkaVersion      = "2.8.6"
     val scalatestVersion = "3.2.19"
-    val chocoVersion     = "4.10.16"
+    val chocoVersion     = "4.10.17"
     val guavaVersion     = "33.3.1-jre"
     val emfcommonVersion = "2.31.0"
     val emfecoreVersion  = "2.37.0"