From 32ec515be80ca5b9c52be5508dc24e176532c62f Mon Sep 17 00:00:00 2001 From: Alwin Egger Date: Mon, 4 Mar 2024 15:29:19 +0100 Subject: [PATCH] workflows use jdk 21; fixed deps --- .github/workflows/sbt-docker-prepublish.yml | 2 +- .github/workflows/sbt-docker-publish.yml | 2 +- .github/workflows/sbt-test.yml | 2 +- build.sbt | 2 +- project/plugins.sbt | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sbt-docker-prepublish.yml b/.github/workflows/sbt-docker-prepublish.yml index 120a6993c..9f2862c4a 100644 --- 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 index a3e7f9736..8a455e9e4 100644 --- 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 index 2fc9014fc..c95ee5c49 100644 --- 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 index 3f9d0bcb1..12ce68225 100644 --- 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 index c874537a3..ebeb55b43 100644 --- 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"