Skip to content

Commit

Permalink
Update deps (#441)
Browse files Browse the repository at this point in the history
* Scala-Steward: Update sbt-scalafix from 0.13.0 to 0.14.0

* Scala-Steward: Update logback-classic from 1.5.15 to 1.5.16

* Scala-Steward: Update postgresql from 42.7.4 to 42.7.5

* Scala-Steward: Update scala-compiler from 2.13.15 to 2.13.16

* Scala-Steward: Update sbt-scalafmt from 2.5.2 to 2.5.4

* Use sbt/setup-sbt

* Bump semanticdb

* Patch Scala versions

---------

Co-authored-by: Pawel Lipski <pawel.p.lipski@gmail.com>
  • Loading branch information
scala-steward and PawelLipski authored Jan 20, 2025
1 parent 5339c80 commit 0f77bec
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
- uses: sbt/setup-sbt@v1

- run: git fetch --tags
- name: Publish Maven artifacts
Expand Down
20 changes: 8 additions & 12 deletions .github/workflows/standard-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
validate-markdown-links
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
- uses: sbt/setup-sbt@v1

- name: Check code style
# Curiously, scalafmtCheckAll doesn't cover *.sbt files, hence scalafmtSbtCheck is needed as well
Expand All @@ -48,40 +48,36 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1

- name: Compile
run: sbt compile Test/compile
- uses: sbt/setup-sbt@v1

- name: Run tests
run: |
sbt "++ 2.12.16 test"
sbt "++ 2.12.17 test"
sbt "++ 2.12.18 test"
sbt "++ 2.12.19 test"
sbt "++ 2.12.20 test"
test-213:
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
- uses: sbt/setup-sbt@v1

- name: Run tests
run: |
sbt "++ 2.13.14 test"
sbt "++ 2.13.15 test"
sbt "++ 2.13.16 test"
test-sbt-plugin:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
- uses: sbt/setup-sbt@v1

- name: Test sbt plugin
run: sbt scripted
Expand All @@ -92,7 +88,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
- uses: sbt/setup-sbt@v1

- name: Substitute sbt plugin snapshot version
run: ./scripts/substitute-sbt-plugin-snapshot-version
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sonatypeProfileName := "org.virtuslab"
Global / onChangedBuildSource := ReloadOnSourceChanges

ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.9.3"
ThisBuild / semanticdbVersion := "4.12.6"

ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo

Expand Down
6 changes: 3 additions & 3 deletions examples/akka-cluster-app/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.virtuslab.ash.AkkaSerializationHelperPlugin

name := "akka-cluster-app"
version := "0.1"
scalaVersion := "2.13.15"
scalaVersion := "2.13.16"

val circeVersion = "0.14.10"
val akkaVersion = "2.6.20"
Expand All @@ -28,7 +28,7 @@ lazy val circeDependency = "io.circe" %% "circe-core" % circeVersion
lazy val ashDependencies =
Seq(AkkaSerializationHelperPlugin.annotation, AkkaSerializationHelperPlugin.circeAkkaSerializer)

lazy val logbackDependency = "ch.qos.logback" % "logback-classic" % "1.5.15"
lazy val logbackDependency = "ch.qos.logback" % "logback-classic" % "1.5.16"

ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.9.3"
ThisBuild / semanticdbVersion := "4.12.6"
4 changes: 2 additions & 2 deletions examples/akka-cluster-app/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.github.sbt" % "sbt-multi-jvm" % "0.6.0")
addSbtPlugin("org.virtuslab.ash" % "sbt-akka-serialization-helper" % "0.9.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
8 changes: 4 additions & 4 deletions examples/akka-persistence-app/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.virtuslab.ash.AkkaSerializationHelperPlugin

name := "akka-persistence-app"

scalaVersion := "2.13.15"
scalaVersion := "2.13.16"

Compile / scalacOptions ++= Seq(
"-target:11",
Expand Down Expand Up @@ -53,14 +53,14 @@ libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-discovery" % akkaVersion,
// Common dependencies for logging and testing
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"ch.qos.logback" % "logback-classic" % "1.5.15",
"ch.qos.logback" % "logback-classic" % "1.5.16",
"org.scalatest" %% "scalatest" % "3.2.12" % Test,
// 3. Using Akka Persistence
"com.typesafe.akka" %% "akka-persistence-typed" % akkaVersion,
"com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion,
"com.lightbend.akka" %% "akka-persistence-jdbc" % akkaPersistenceJdbcVersion,
"com.typesafe.akka" %% "akka-persistence-testkit" % akkaVersion % Test,
"org.postgresql" % "postgresql" % "42.7.4",
"org.postgresql" % "postgresql" % "42.7.5",
// 4. Querying or projecting data from Akka Persistence
"com.typesafe.akka" %% "akka-persistence-query" % akkaVersion,
"com.lightbend.akka" %% "akka-projection-eventsourced" % akkaProjectionVersion,
Expand All @@ -73,4 +73,4 @@ libraryDependencies ++= Seq(
AkkaSerializationHelperPlugin.circeAkkaSerializer)

ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.9.3"
ThisBuild / semanticdbVersion := "4.12.6"
4 changes: 2 additions & 2 deletions examples/akka-persistence-app/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ val sbtNativePackagerVersion = "1.9.9"

addSbtPlugin("com.github.sbt" % "sbt-native-packager" % sbtNativePackagerVersion)
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % akkaGrpcSbtPluginVersion)
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
addSbtPlugin("org.virtuslab.ash" % "sbt-akka-serialization-helper" % "0.9.0")
4 changes: 2 additions & 2 deletions examples/event-migration/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt.Keys.{semanticdbEnabled, semanticdbVersion}

name := "event-migration"
version := "0.1"
scalaVersion := "2.13.15"
scalaVersion := "2.13.16"

val circeVersion = "0.14.10"
val circeGenericExtrasVersion = "0.14.4"
Expand All @@ -25,5 +25,5 @@ libraryDependencies += "org.scalatest" %% "scalatest" % scalaTestVersion % Test
scalacOptions += "-Ymacro-annotations"

ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.9.3"
ThisBuild / semanticdbVersion := "4.12.6"
scalacOptions += "-Ywarn-unused"
4 changes: 2 additions & 2 deletions examples/event-migration/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbt._

object Dependencies {
val scalaVersion213 = "2.13.15"
val scalaVersion213 = "2.13.16"
val scalaVersion212 = "2.12.20"

val akkaProjectionVersion = "1.2.5"
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ addDependencyTreePlugin

addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lazy val scala213 = "2.13.15"
lazy val scala213 = "2.13.16"
lazy val scala212 = "2.12.18"

name := "simple-dump"
Expand Down

0 comments on commit 0f77bec

Please sign in to comment.