From ee5a4a8609c84dfefc07b93272b6d7e2f7a5852c Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Fri, 9 Jun 2023 17:51:27 -0400 Subject: [PATCH 1/2] Bump sbt, plugins and Scala versions --- .github/workflows/checks.yml | 9 +++++---- build.sbt | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c706bcb..e1f59b4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -11,9 +11,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: - - graalvm-ce-java11@21 - - zulu@1.8 + jvm: + - temurin-jre:1.17.0.7 + - graalvm-java11:22.3.2 + - zulu:8.0.372 os: - ubuntu-latest fail-fast: false @@ -26,7 +27,7 @@ jobs: - uses: coursier/cache-action@v6 - uses: coursier/setup-action@v1 with: - java-version: ${{ matrix.java }} + jvm: ${{ matrix.jvm }} - name: Compile, test and check format, coverage run: "sbt -batch clean checkFormatting +test scoverage" shell: bash \ No newline at end of file diff --git a/build.sbt b/build.sbt index f833662..fb37dc0 100644 --- a/build.sbt +++ b/build.sbt @@ -53,8 +53,8 @@ val publishSettings = sonatypeSettings ++ Seq( val commonSettings = Seq( organization := "com.daodecode", - scalaVersion := "2.13.10", - crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.17"), + scalaVersion := "2.13.11", + crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.18"), scalafmtConfig := Some(scalaj.base / "scalafmt-config/.scalafmt.conf") ) ++ releaseSettings ++ crossVersionSourcesSettings diff --git a/project/build.properties b/project/build.properties index 46e43a9..40b3b8e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 319c7e1..27ba113 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") -addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.3.1") +addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.3.8") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") @@ -10,4 +10,4 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.6.0-RC4") -addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") +addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") From b450357aa7e263d12a73eb65788bcea4069969c4 Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Fri, 9 Jun 2023 18:13:44 -0400 Subject: [PATCH 2/2] Bump sbt, plugins and Scala versions + drop Scala 2.11 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index fb37dc0..eb8204a 100644 --- a/build.sbt +++ b/build.sbt @@ -54,7 +54,7 @@ val publishSettings = sonatypeSettings ++ Seq( val commonSettings = Seq( organization := "com.daodecode", scalaVersion := "2.13.11", - crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.18"), + crossScalaVersions := Seq(scalaVersion.value, "2.12.18"), scalafmtConfig := Some(scalaj.base / "scalafmt-config/.scalafmt.conf") ) ++ releaseSettings ++ crossVersionSourcesSettings