From f20fca2eb17d26e8e2471ad81c223582e29af6e9 Mon Sep 17 00:00:00 2001 From: Filippo Mariotti Date: Fri, 4 Oct 2019 20:03:48 +0100 Subject: [PATCH] Updated scala to 2.13.1 (#110) * Updated scala to 2.13.1 * Updated failing plugins --- .travis.yml | 2 +- build.sbt | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3a7df7c..1add858a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: scala scala: - 2.12.10 - 2.11.12 - - 2.13.0 + - 2.13.1 jdk: - openjdk8 diff --git a/build.sbt b/build.sbt index a89dc1f9..b3f8d306 100644 --- a/build.sbt +++ b/build.sbt @@ -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", @@ -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( @@ -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 ) /** @@ -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( @@ -174,7 +177,7 @@ lazy val root = project ), addCommandAlias( "fullCiBuild", - ";checkFormat;unusedCompileDependenciesTest;undeclaredCompileDependenciesTest;clean;test" + ";checkFormat;clean;unusedCompileDependenciesTest;undeclaredCompileDependencies;test" ) )