Skip to content

Commit 7f1d9e9

Browse files
authored
build: Set the default Scala version to 2.13.1 (#146)
* build: Set the default Scala version to 2.13.1 build: Enable cross-build to Scala 2.13 and 2.12 * fix: Scalafix rule ExplicitResultTypes is not supported in 2.13 scalacenter/scalafix#991
1 parent 71421fa commit 7f1d9e9

File tree

6 files changed

+5
-10
lines changed

6 files changed

+5
-10
lines changed

.scala-steward.conf

Lines changed: 0 additions & 5 deletions
This file was deleted.

.scalafix.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ rules = [
22
SortImports
33
Disable
44
DisableSyntax
5-
ExplicitResultTypes
65
LeakingImplicitClassVal
76
MissingFinal
87
NoAutoTupling

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ThisBuild / description := "Functional programming toolkit for building server a
66
ThisBuild / licenses := Seq("MIT" -> url("https://raw.githubusercontent.com/avast/scala-server-toolkit/master/LICENSE"))
77
ThisBuild / developers := List(Developer("jakubjanecek", "Jakub Janecek", "[email protected]", url("https://www.avast.com")))
88

9-
ThisBuild / scalaVersion := "2.12.10"
9+
ThisBuild / scalaVersion := "2.13.1"
1010
ThisBuild / turbo := true
1111
Global / onChangedBuildSource := ReloadOnSourceChanges
1212
Global / cancelable := true
@@ -400,5 +400,5 @@ lazy val sslConfig = project
400400
)
401401
)
402402

403-
addCommandAlias("checkAll", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check; test:scalafix --check; test")
403+
addCommandAlias("checkAll", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check; test:scalafix --check; +test")
404404
addCommandAlias("fixAll", "; compile:scalafix; test:scalafix; scalafmtSbt; scalafmtAll")

doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object DoobieHikariModule {
2626
)(implicit cs: ContextShift[F]): Resource[F, HikariTransactor[F]] = {
2727
for {
2828
hikariConfig <- Resource.liftF(makeHikariConfig(config, metricsTrackerFactory))
29-
transactor <- HikariTransactor.fromHikariConfig(hikariConfig, boundedConnectExecutionContext, blocker.blockingContext)
29+
transactor <- HikariTransactor.fromHikariConfig(hikariConfig, boundedConnectExecutionContext, blocker)
3030
} yield transactor
3131
}
3232

project/BuildSettings.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import wartremover.WartRemover.autoImport._
1212
object BuildSettings {
1313

1414
lazy val common: Seq[Def.Setting[_]] = Seq(
15+
crossScalaVersions := List(scalaVersion.value, "2.12.10"),
1516
fork := true,
1617
libraryDependencies ++= Seq(
1718
compilerPlugin(Dependencies.kindProjector),

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object Dependencies {
3838
object Versions {
3939

4040
val datastaxJavaDriverCore = "4.4.0"
41-
val doobie = "0.7.1"
41+
val doobie = "0.8.8"
4242
val grpc = "1.27.0"
4343
val http4s = "0.21.0"
4444
val micrometerCore = "1.3.3"

0 commit comments

Comments
 (0)