From 3299e152552c74e06e3ee993b3bbea3b8240a457 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 6 May 2024 19:40:09 +0200 Subject: [PATCH] Update deps (#408) * Scala-Steward: Update sbt-scalafix from 0.12.0 to 0.12.1 * Scala-Steward: Update circe-core from 0.14.6 to 0.14.7 * Scala-Steward: Update scala-compiler from 2.13.13 to 2.13.14 * Scala-Steward: Update sbt from 1.9.9 to 1.10.0 * Bump semanticdbVersion + Scala versions in CI * Remove redundant @nowarn * Drop old Scala versions from CI --------- Co-authored-by: Pawel Lipski --- .github/workflows/standard-workflow.yml | 36 +++---------------- build.sbt | 21 +++-------- .../ash/circe/CustomSerializer.scala | 3 +- examples/akka-cluster-app/build.sbt | 6 ++-- .../akka-cluster-app/project/build.properties | 2 +- examples/akka-cluster-app/project/plugins.sbt | 2 +- examples/akka-persistence-app/build.sbt | 6 ++-- .../project/build.properties | 2 +- .../akka-persistence-app/project/plugins.sbt | 2 +- examples/event-migration/build.sbt | 6 ++-- .../event-migration/project/build.properties | 2 +- examples/event-migration/project/plugins.sbt | 2 +- project/Dependencies.scala | 4 +-- project/build.properties | 2 +- project/plugins.sbt | 2 +- .../dependencies/project/build.properties | 2 +- .../sbt-test/sbt-dumpschema/simple/build.sbt | 4 +-- .../simple/project/build.properties | 2 +- 18 files changed, 33 insertions(+), 73 deletions(-) diff --git a/.github/workflows/standard-workflow.yml b/.github/workflows/standard-workflow.yml index cfcb7743..8f20a8b6 100644 --- a/.github/workflows/standard-workflow.yml +++ b/.github/workflows/standard-workflow.yml @@ -55,14 +55,12 @@ jobs: - name: Run tests run: | - sbt "++ 2.12.13 test" - sbt "++ 2.12.14 test" - sbt "++ 2.12.15 test" sbt "++ 2.12.16 test" sbt "++ 2.12.17 test" sbt "++ 2.12.18 test" + sbt "++ 2.12.19 test" - test-213-1: + test-213: runs-on: ubuntu-latest steps: @@ -75,31 +73,7 @@ jobs: - name: Run tests run: | - sbt "++ 2.13.2 test" - sbt "++ 2.13.3 test" - sbt "++ 2.13.4 test" - sbt "++ 2.13.5 test" - sbt "++ 2.13.6 test" - sbt "++ 2.13.7 test" - - test-213-2: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - uses: coursier/cache-action@v6 - - uses: coursier/setup-action@v1 - - - name: Compile - run: sbt compile Test/compile - - - name: Run tests - run: | - sbt "++ 2.13.8 test" - sbt "++ 2.13.9 test" - sbt "++ 2.13.10 test" - sbt "++ 2.13.11 test" - sbt "++ 2.13.12 test" + sbt "++ 2.13.14 test" test-sbt-plugin: runs-on: ubuntu-latest @@ -138,7 +112,7 @@ jobs: # patch-and-push-to-psh: if: github.event_name != 'pull_request' - needs: [code-style-check, test-212, test-213-1, test-213-2, test-sbt-plugin, run-examples] + needs: [code-style-check, test-212, test-213, test-sbt-plugin, run-examples] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -168,7 +142,7 @@ jobs: # publish-maven-artifacts: - needs: [code-style-check, test-212, test-213-1, test-213-2, test-sbt-plugin, run-examples] + needs: [code-style-check, test-212, test-213, test-sbt-plugin, run-examples] if: github.event_name != 'pull_request' runs-on: ubuntu-latest steps: diff --git a/build.sbt b/build.sbt index f54fe0be..e50958e0 100644 --- a/build.sbt +++ b/build.sbt @@ -11,21 +11,7 @@ initialize ~= { _ => lazy val targetScalaVersions = List(scalaVersion213, scalaVersion212) lazy val testAgainstScalaVersions = - targetScalaVersions ++ List( - "2.12.13", - "2.12.14", - "2.12.15", - "2.12.16", - "2.12.17", - "2.13.2", - "2.13.3", - "2.13.4", - "2.13.5", - "2.13.6", - "2.13.7", - "2.13.8", - "2.13.9", - "2.13.10") + targetScalaVersions ++ List("2.12.16", "2.12.17", "2.12.18") ThisBuild / scalaVersion := targetScalaVersions.head ThisBuild / organization := "org.virtuslab.ash" @@ -43,7 +29,7 @@ sonatypeProfileName := "org.virtuslab" Global / onChangedBuildSource := ReloadOnSourceChanges ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.7.8" +ThisBuild / semanticdbVersion := "4.9.3" ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo @@ -87,7 +73,8 @@ lazy val assemblySettings = Seq( val art = (Compile / assembly / artifact).value art.withClassifier(None) }, - assembly / assemblyJarName := s"${name.value}_${scalaBinaryVersion.value}-${version.value}.jar", // Warning: this is a default name for packageBin artefact. Without explicit rename of packageBin will result in race condition + // Warning: this is a default name for packageBin artefact. Without explicit rename of packageBin will result in race condition + assembly / assemblyJarName := s"${name.value}_${scalaBinaryVersion.value}-${version.value}.jar", addArtifact(Compile / assembly / artifact, assembly)) publish / skip := true diff --git a/circe-akka-serializer/src/test/scala/org/virtuslab/ash/circe/CustomSerializer.scala b/circe-akka-serializer/src/test/scala/org/virtuslab/ash/circe/CustomSerializer.scala index a6d6b549..35d00019 100644 --- a/circe-akka-serializer/src/test/scala/org/virtuslab/ash/circe/CustomSerializer.scala +++ b/circe-akka-serializer/src/test/scala/org/virtuslab/ash/circe/CustomSerializer.scala @@ -1,6 +1,5 @@ package org.virtuslab.ash.circe -import scala.annotation.nowarn import scala.reflect.runtime.{universe => ru} import akka.actor.ExtendedActorSystem @@ -13,7 +12,7 @@ import org.virtuslab.ash.circe.data._ class CustomSerializer(actorSystem: ExtendedActorSystem) extends CirceAkkaSerializer[CirceSerializabilityTrait](actorSystem) { - @nowarn implicit private val serializabilityCodec: Codec[CirceSerializabilityTrait] = genericCodec + implicit val serializabilityCodec: Codec[CirceSerializabilityTrait] = genericCodec override def identifier: Int = 42352 diff --git a/examples/akka-cluster-app/build.sbt b/examples/akka-cluster-app/build.sbt index 33768774..807c0b1f 100644 --- a/examples/akka-cluster-app/build.sbt +++ b/examples/akka-cluster-app/build.sbt @@ -4,9 +4,9 @@ import org.virtuslab.ash.AkkaSerializationHelperPlugin name := "akka-cluster-app" version := "0.1" -scalaVersion := "2.13.13" +scalaVersion := "2.13.14" -val circeVersion = "0.14.6" +val circeVersion = "0.14.7" val akkaVersion = "2.6.20" lazy val `akka-cluster-app` = project @@ -31,4 +31,4 @@ lazy val ashDependencies = lazy val logbackDependency = "ch.qos.logback" % "logback-classic" % "1.5.6" ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.7.8" +ThisBuild / semanticdbVersion := "4.9.3" diff --git a/examples/akka-cluster-app/project/build.properties b/examples/akka-cluster-app/project/build.properties index 04267b14..081fdbbc 100644 --- a/examples/akka-cluster-app/project/build.properties +++ b/examples/akka-cluster-app/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/examples/akka-cluster-app/project/plugins.sbt b/examples/akka-cluster-app/project/plugins.sbt index 9ba90053..a56568e1 100644 --- a/examples/akka-cluster-app/project/plugins.sbt +++ b/examples/akka-cluster-app/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("com.github.sbt" % "sbt-multi-jvm" % "0.6.0") addSbtPlugin("org.virtuslab.ash" % "sbt-akka-serialization-helper" % "0.8.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") diff --git a/examples/akka-persistence-app/build.sbt b/examples/akka-persistence-app/build.sbt index 401a1de3..3eb1a656 100644 --- a/examples/akka-persistence-app/build.sbt +++ b/examples/akka-persistence-app/build.sbt @@ -2,7 +2,7 @@ import org.virtuslab.ash.AkkaSerializationHelperPlugin name := "akka-persistence-app" -scalaVersion := "2.13.13" +scalaVersion := "2.13.14" Compile / scalacOptions ++= Seq( "-target:11", @@ -28,7 +28,7 @@ val akkaHttp2SupportVersion = "10.2.10" val akkaManagementVersion = "1.1.4" val akkaPersistenceJdbcVersion = "5.1.0" val akkaProjectionVersion = "1.2.5" -val circeVersion = "0.14.6" +val circeVersion = "0.14.7" val scalikeJdbcVersion = "3.5.0" enablePlugins(AkkaGrpcPlugin, JavaAppPackaging, DockerPlugin, AkkaSerializationHelperPlugin) @@ -76,4 +76,4 @@ libraryDependencies ++= Seq( AkkaSerializationHelperPlugin.circeAkkaSerializer) ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.7.8" +ThisBuild / semanticdbVersion := "4.9.3" diff --git a/examples/akka-persistence-app/project/build.properties b/examples/akka-persistence-app/project/build.properties index 04267b14..081fdbbc 100644 --- a/examples/akka-persistence-app/project/build.properties +++ b/examples/akka-persistence-app/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/examples/akka-persistence-app/project/plugins.sbt b/examples/akka-persistence-app/project/plugins.sbt index 38be621a..b54aef51 100644 --- a/examples/akka-persistence-app/project/plugins.sbt +++ b/examples/akka-persistence-app/project/plugins.sbt @@ -5,5 +5,5 @@ val akkaGrpcSbtPluginVersion = "2.1.6" addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % akkaGrpcSbtPluginVersion) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("org.virtuslab.ash" % "sbt-akka-serialization-helper" % "0.8.0") diff --git a/examples/event-migration/build.sbt b/examples/event-migration/build.sbt index f10e3ca9..b706c7f8 100644 --- a/examples/event-migration/build.sbt +++ b/examples/event-migration/build.sbt @@ -2,9 +2,9 @@ import sbt.Keys.{semanticdbEnabled, semanticdbVersion} name := "event-migration" version := "0.1" -scalaVersion := "2.13.13" +scalaVersion := "2.13.14" -val circeVersion = "0.14.6" +val circeVersion = "0.14.7" val circeGenericExtrasVersion = "0.14.3" val borerVersion = "1.8.0" val scalaTestVersion = "3.2.10" @@ -25,5 +25,5 @@ libraryDependencies += "org.scalatest" %% "scalatest" % scalaTestVersion % Test scalacOptions += "-Ymacro-annotations" ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.7.8" +ThisBuild / semanticdbVersion := "4.9.3" scalacOptions += "-Ywarn-unused" diff --git a/examples/event-migration/project/build.properties b/examples/event-migration/project/build.properties index 04267b14..081fdbbc 100644 --- a/examples/event-migration/project/build.properties +++ b/examples/event-migration/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/examples/event-migration/project/plugins.sbt b/examples/event-migration/project/plugins.sbt index ed08767b..6e2a580f 100644 --- a/examples/event-migration/project/plugins.sbt +++ b/examples/event-migration/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3ee5f229..ed70aa40 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVersion213 = "2.13.13" + val scalaVersion213 = "2.13.14" val scalaVersion212 = "2.12.19" val akkaProjectionVersion = "1.2.5" @@ -10,7 +10,7 @@ object Dependencies { val akkaVersion = "2.6.20" val borerVersion = "1.8.0" val circeYamlVersion = "1.15.0" - val circeVersion = "0.14.6" + val circeVersion = "0.14.7" val circeGenericExtrasVersion = "0.14.3" val scalaTest = "org.scalatest" %% "scalatest" % "3.2.18" diff --git a/project/build.properties b/project/build.properties index 04267b14..081fdbbc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 81cd1022..f955d2df 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,6 @@ addDependencyTreePlugin addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") diff --git a/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/dependencies/project/build.properties b/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/dependencies/project/build.properties index 04267b14..081fdbbc 100644 --- a/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/dependencies/project/build.properties +++ b/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/dependencies/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/build.sbt b/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/build.sbt index a31ac1b9..2d08aa25 100644 --- a/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/build.sbt +++ b/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/build.sbt @@ -1,5 +1,5 @@ -lazy val scala213 = "2.13.6" -lazy val scala212 = "2.12.14" +lazy val scala213 = "2.13.14" +lazy val scala212 = "2.12.18" name := "simple-dump" version := "0.1" diff --git a/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/project/build.properties b/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/project/build.properties index 04267b14..081fdbbc 100644 --- a/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/project/build.properties +++ b/sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0