Skip to content

Commit 8962d34

Browse files
authored
Merge branch 'master' into update/scala-library-2.13.5
2 parents 17690c7 + eac1da6 commit 8962d34

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

project/BuildSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object BuildSettings {
2424
licenses := Seq("MIT" -> url("https://raw.githubusercontent.com/avast/scala-server-toolkit/master/LICENSE")),
2525
developers := List(Developer("jakubjanecek", "Jakub Janecek", "[email protected]", url("https://www.avast.com"))),
2626
scalaVersion := "2.13.5",
27-
crossScalaVersions := List(scalaVersion.value, "2.12.12"),
27+
crossScalaVersions := List(scalaVersion.value, "2.12.13"),
2828
fork := true,
2929
libraryDependencies ++= Seq(
3030
compilerPlugin(Dependencies.kindProjector),

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ object Dependencies {
2727
val monixCatnap = "io.monix" %% "monix-catnap" % Versions.monix
2828
val monixEval = "io.monix" %% "monix-eval" % Versions.monix
2929
val postgresql = "org.postgresql" % "postgresql" % "42.2.19"
30-
val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.14.0"
30+
val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.14.1"
3131
val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"
32-
val scalafixScaluzzi = "com.github.vovapolu" %% "scaluzzi" % "0.1.17"
32+
val scalafixScaluzzi = "com.github.vovapolu" %% "scaluzzi" % "0.1.18"
3333
val scalafixOrganizeImports = "com.github.liancheng" %% "organize-imports" % "0.5.0"
3434
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.5"
3535
val sentry = "io.sentry" % "sentry" % "4.2.0"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")
2-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.25")
2+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
44
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")
55
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.2")

0 commit comments

Comments
 (0)