Skip to content

Commit

Permalink
Updated scala to 2.13.1 (#110)
Browse files Browse the repository at this point in the history
* Updated scala to 2.13.1

* Updated failing plugins
  • Loading branch information
barambani authored Oct 4, 2019
1 parent 09d509d commit f20fca2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ language: scala
scala:
- 2.12.10
- 2.11.12
- 2.13.0
- 2.13.1

jdk:
- openjdk8
Expand Down
23 changes: 13 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._

lazy val `scala 211` = "2.11.12"
lazy val `scala 212` = "2.12.10"
lazy val `scala 213` = "2.13.0"
lazy val `scala 213` = "2.13.1"

lazy val commonOptions = Seq(
"-deprecation",
Expand Down Expand Up @@ -56,19 +56,18 @@ lazy val versionOf = new {
val cats = "2.0.0"
val catsEffect = "2.0.0"
val fs2 = "2.0.1"
val kindProjector = "0.10.3"
val kindProjector = "0.11.0"
val log4s = "1.8.2"
val scalaCheck = "1.14.2"
val scalaTest = "3.2.0-M1"
val zio = "1.0.0-RC14"
val scribe = "2.7.9"
val silencer = "1.4.2"
val silencer = "1.4.4"
}

lazy val coreDependencies = Seq(
"com.github.ghik" %% "silencer-lib" % versionOf.silencer,
"org.log4s" %% "log4s" % versionOf.log4s,
"com.outr" %% "scribe" % versionOf.scribe
"org.log4s" %% "log4s" % versionOf.log4s,
"com.outr" %% "scribe" % versionOf.scribe
) map (_.withSources)

lazy val fs2Dependencies = Seq(
Expand All @@ -93,9 +92,12 @@ lazy val testDependencies = Seq(

lazy val compilerPluginsDependencies = Seq(
compilerPlugin(
"org.typelevel" %% "kind-projector" % versionOf.kindProjector cross CrossVersion.binary
"org.typelevel" %% "kind-projector" % versionOf.kindProjector cross CrossVersion.full
),
compilerPlugin(
"com.github.ghik" %% "silencer-plugin" % versionOf.silencer cross CrossVersion.full
),
compilerPlugin("com.github.ghik" %% "silencer-plugin" % versionOf.silencer)
"com.github.ghik" %% "silencer-lib" % versionOf.silencer % Provided cross CrossVersion.full
)

/**
Expand All @@ -113,7 +115,8 @@ lazy val crossBuildSettings = Seq(
case `scala 213` => scala213Options
case _ => commonOptions
}),
parallelExecution in Test := false
parallelExecution in Test := false,
unusedCompileDependenciesFilter -= moduleFilter("com.github.ghik", "silencer-lib")
)

lazy val releaseSettings: Seq[Def.Setting[_]] = Seq(
Expand Down Expand Up @@ -174,7 +177,7 @@ lazy val root = project
),
addCommandAlias(
"fullCiBuild",
";checkFormat;unusedCompileDependenciesTest;undeclaredCompileDependenciesTest;clean;test"
";checkFormat;clean;unusedCompileDependenciesTest;undeclaredCompileDependencies;test"
)
)

Expand Down

0 comments on commit f20fca2

Please sign in to comment.