Skip to content

Commit

Permalink
build: Set the default Scala version to 2.13.1 (#146)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jakubjanecek authored Feb 10, 2020
1 parent 71421fa commit 7f1d9e9
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 10 deletions.
5 changes: 0 additions & 5 deletions .scala-steward.conf

This file was deleted.

1 change: 0 additions & 1 deletion .scalafix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ rules = [
SortImports
Disable
DisableSyntax
ExplicitResultTypes
LeakingImplicitClassVal
MissingFinal
NoAutoTupling
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ThisBuild / description := "Functional programming toolkit for building server a
ThisBuild / licenses := Seq("MIT" -> url("https://raw.githubusercontent.com/avast/scala-server-toolkit/master/LICENSE"))
ThisBuild / developers := List(Developer("jakubjanecek", "Jakub Janecek", "[email protected]", url("https://www.avast.com")))

ThisBuild / scalaVersion := "2.12.10"
ThisBuild / scalaVersion := "2.13.1"
ThisBuild / turbo := true
Global / onChangedBuildSource := ReloadOnSourceChanges
Global / cancelable := true
Expand Down Expand Up @@ -400,5 +400,5 @@ lazy val sslConfig = project
)
)

addCommandAlias("checkAll", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check; test:scalafix --check; test")
addCommandAlias("checkAll", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check; test:scalafix --check; +test")
addCommandAlias("fixAll", "; compile:scalafix; test:scalafix; scalafmtSbt; scalafmtAll")
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object DoobieHikariModule {
)(implicit cs: ContextShift[F]): Resource[F, HikariTransactor[F]] = {
for {
hikariConfig <- Resource.liftF(makeHikariConfig(config, metricsTrackerFactory))
transactor <- HikariTransactor.fromHikariConfig(hikariConfig, boundedConnectExecutionContext, blocker.blockingContext)
transactor <- HikariTransactor.fromHikariConfig(hikariConfig, boundedConnectExecutionContext, blocker)
} yield transactor
}

Expand Down
1 change: 1 addition & 0 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import wartremover.WartRemover.autoImport._
object BuildSettings {

lazy val common: Seq[Def.Setting[_]] = Seq(
crossScalaVersions := List(scalaVersion.value, "2.12.10"),
fork := true,
libraryDependencies ++= Seq(
compilerPlugin(Dependencies.kindProjector),
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ object Dependencies {
object Versions {

val datastaxJavaDriverCore = "4.4.0"
val doobie = "0.7.1"
val doobie = "0.8.8"
val grpc = "1.27.0"
val http4s = "0.21.0"
val micrometerCore = "1.3.3"
Expand Down

0 comments on commit 7f1d9e9

Please sign in to comment.