Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

Commit

Permalink
Scala 2.13.1 (#132)
Browse files Browse the repository at this point in the history
* Scala 2.13.1

* Updated scoverage
  • Loading branch information
barambani authored Nov 20, 2019
1 parent b3decac commit f968639
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: false

language: scala
scala:
- 2.13.0
- 2.13.1

jdk:
- openjdk11
Expand Down
17 changes: 9 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ lazy val versionOf = new {
val circe = "0.12.3"
val fs2 = "2.1.0"
val http4s = "0.21.0-M5"
val kindProjector = "0.10.3"
val kindProjector = "0.11.0"
val `log-effect` = "0.12.0"
val `logback-classic` = "1.2.3"
val scalaCheck = "1.14.2"
val scalaTest = "3.2.0-M1"
val zio = "1.0.0-RC17"
val `zio-interop-cats` = "2.0.0.0-RC8"
val shapeless = "2.3.3"
val silencer = "1.4.2"
val silencer = "1.4.4"
}

/*
Expand Down Expand Up @@ -49,7 +49,7 @@ val externalDependencies = Seq(
"io.laserdisc" %% "log-effect-core" % versionOf.`log-effect`,
"io.laserdisc" %% "log-effect-zio" % versionOf.`log-effect`,
"ch.qos.logback" % "logback-classic" % versionOf.`logback-classic`,
"com.github.ghik" %% "silencer-lib" % versionOf.silencer,
"com.github.ghik" %% "silencer-lib" % versionOf.silencer % Provided cross CrossVersion.full,
"dev.zio" %% "zio" % versionOf.zio,
"dev.zio" %% "zio-interop-cats" % versionOf.`zio-interop-cats`
) map (_.withSources)
Expand All @@ -69,8 +69,8 @@ val testDependencies = Seq(
* Compiler plugins
*/
val compilerPlugins: Seq[ModuleID] = Seq(
compilerPlugin("org.typelevel" %% "kind-projector" % versionOf.kindProjector),
compilerPlugin("com.github.ghik" %% "silencer-plugin" % versionOf.silencer)
compilerPlugin("org.typelevel" %% "kind-projector" % versionOf.kindProjector cross CrossVersion.full),
compilerPlugin("com.github.ghik" %% "silencer-plugin" % versionOf.silencer cross CrossVersion.full)
)

val generalOptions: Seq[String] = Seq(
Expand Down Expand Up @@ -140,7 +140,7 @@ val root = project
.settings(
name := "http4s-poc-api",
organization := "com.github.barambani",
scalaVersion := "2.13.0",
scalaVersion := "2.13.1",
libraryDependencies ++= externalDependencies ++ testDependencies ++ compilerPlugins,
unusedCompileDependenciesFilter -= moduleFilter("ch.qos.logback", "logback-classic"),
addCommandAlias("format", ";scalafmt;test:scalafmt;scalafmtSbt"),
Expand All @@ -150,7 +150,7 @@ val root = project
),
addCommandAlias(
"fullBuild",
";checkFormat;unusedCompileDependenciesTest;undeclaredCompileDependenciesTest;clean;coverage;test;coverageReport;coverageAggregate"
";checkFormat;unusedCompileDependenciesTest;clean;coverage;test;coverageReport;coverageAggregate"
),
addCommandAlias(
"fullCiBuild",
Expand All @@ -159,5 +159,6 @@ val root = project
scalacOptions ++= generalOptions,
scalacOptions in Test ++= testOnlyOptions,
scalacOptions in (Compile, console) --= nonTestExceptions,
javaOptions in Universal := jreRuntimeOptions
javaOptions in Universal := jreRuntimeOptions,
unusedCompileDependenciesFilter -= moduleFilter("com.github.ghik", "silencer-lib")
)
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.12")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/HealthCheckHttpApiTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class HealthCheckHttpApiTests extends AnyFlatSpec with Matchers with Fixtu
(
sign.name isSameAs "http4s-poc-api",
sign.version isNotSameAs "",
sign.scalaVersion isSameAs "2.13.0",
sign.scalaVersion isSameAs "2.13.1",
sign.scalaOrganization isSameAs "org.scala-lang"
).mapN((_, _, _, _) => sign)
)
Expand Down

0 comments on commit f968639

Please sign in to comment.