workflows use jdk 21; fixed deps

OpenOlitor · Mar 4, 2024 · 32ec515 · 32ec515
1 parent 736e681
commit 32ec515
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/sbt-docker-prepublish.yml b/.github/workflows/sbt-docker-prepublish.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 17
+        java-version: 21
         distribution: temurin
     - name: Docker Login
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin

diff --git a/.github/workflows/sbt-docker-publish.yml b/.github/workflows/sbt-docker-publish.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 17
+        java-version: 21
         distribution: temurin
     - name: Docker Login
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin

diff --git a/.github/workflows/sbt-test.yml b/.github/workflows/sbt-test.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 17
+        java-version: 21
         distribution: temurin
     - name: Run Tests
       run: sbt "coverage; test; coverageReport; coverageAggregate;"

diff --git a/build.sbt b/build.sbt
@@ -43,7 +43,7 @@ val buildSettings = Seq(
   .setPreference(AlignSingleLineCaseStatements, true),
   version := "2.6.29",
   scalaVersion := "2.13.11",
-  crossScalaVersions := Seq("2.13.8", "2.13.10", "2.13.11"),
+  crossScalaVersions := Seq("2.12.19", "2.13.8", "2.13.10", "2.13.11"),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
   resolvers ++= Resolver.sonatypeOssRepos("releases"),
   resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
 
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
@@ -8,6 +8,6 @@ addSbtPlugin("org.scalaxb" % "sbt-scalaxb" % "1.9.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0")
 //addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.10")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
 
-dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
+dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.2.0"