From 8881d78361ca2b6e12c678a0a94721c262417e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:27:07 +0100 Subject: [PATCH] Bump deps (#400) * Update scala-java-time to 2.5.0 * Update scala-collection-compat to 2.9.0 * Update sbt-tpolecat to 0.4.2 * Fix warning on docs * Empty-Commit * Allows warnings on docs * Remove fatal warnings flag --------- Co-authored-by: fortyseven_degrees Co-authored-by: Francisco Diaz --- build.sbt | 12 ++++++++---- microsite/docs/docs/datetime/granularity.md | 2 +- project/MicrositeSettingsPlugin.scala | 6 +++--- project/plugins.sbt | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index e1e3e75..b8ee56b 100644 --- a/build.sbt +++ b/build.sbt @@ -23,7 +23,8 @@ lazy val microsite = project ) .settings( publish / skip := true, - unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects( + scalacOptions --= Seq("-Werror", "-Xfatal-warnings"), + ScalaUnidoc / unidoc / unidocProjectFilter := inProjects( Seq( `scalacheck-toolbox-datetime`.jvm(scala2_13), `scalacheck-toolbox-magic`.jvm(scala2_13), @@ -45,8 +46,9 @@ lazy val `scalacheck-toolbox-datetime`: ProjectMatrix = .settings( libraryDependencies ++= Seq( "org.scalacheck" %%% "scalacheck" % "1.17.0", - "org.scala-lang.modules" %%% "scala-collection-compat" % "2.8.1" - ) + "org.scala-lang.modules" %%% "scala-collection-compat" % "2.9.0" + ), + scalacOptions --= Seq("-Werror", "-Xfatal-warnings") ) .jvmPlatform( scalaVersions = allScalaVersions, @@ -55,7 +57,7 @@ lazy val `scalacheck-toolbox-datetime`: ProjectMatrix = .jsPlatform( scalaVersions = allScalaVersions, settings = Seq( - libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.4.0" % Test + libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" % Test ) ) @@ -64,11 +66,13 @@ lazy val `scalacheck-toolbox-magic`: ProjectMatrix = .enablePlugins(BigListOfNaughtyStringsPlugin) .settings(description := "ScalaCheck Generators for magic values") .settings(libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.17.0") + .settings(scalacOptions --= Seq("-Werror", "-Xfatal-warnings")) .jvmPlatform(scalaVersions = allScalaVersions) lazy val `scalacheck-toolbox-combinators`: ProjectMatrix = (projectMatrix in file("modules/scalacheck-toolbox-combinators")) .settings(description := "Useful generic combinators for ScalaCheck") .settings(libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.17.0") + .settings(scalacOptions --= Seq("-Werror", "-Xfatal-warnings")) .jvmPlatform(scalaVersions = allScalaVersions) .jsPlatform(scalaVersions = allScalaVersions) diff --git a/microsite/docs/docs/datetime/granularity.md b/microsite/docs/docs/datetime/granularity.md index 87a15eb..5492c43 100644 --- a/microsite/docs/docs/datetime/granularity.md +++ b/microsite/docs/docs/datetime/granularity.md @@ -28,7 +28,7 @@ import com.fortysevendeg.scalacheck.datetime.jdk8.ArbitraryJdk8._ import com.fortysevendeg.scalacheck.datetime.jdk8.granularity.years val prop = forAll { (zdt: ZonedDateTime) => - (zdt.getMonth == Month.JANUARY) + (zdt.getMonth == Month.JANUARY) && (zdt.getDayOfMonth == 1) && (zdt.getHour == 0) && (zdt.getMinute == 0) && diff --git a/project/MicrositeSettingsPlugin.scala b/project/MicrositeSettingsPlugin.scala index 4af68a5..4668389 100644 --- a/project/MicrositeSettingsPlugin.scala +++ b/project/MicrositeSettingsPlugin.scala @@ -31,10 +31,10 @@ object MicrositeSettingsPlugin extends AutoPlugin { micrositePushSiteWith := GitHub4s, micrositeTheme := "pattern", micrositeGithubToken := Option(System.getenv().get("GITHUB_TOKEN")), - docsMappingsAPIDir in ScalaUnidoc := "api", + ScalaUnidoc / docsMappingsAPIDir := "api", addMappingsToSiteDir( - mappings in (ScalaUnidoc, packageDoc), - docsMappingsAPIDir in ScalaUnidoc + ScalaUnidoc / packageDoc / mappings, + ScalaUnidoc / docsMappingsAPIDir ) ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 451b34a..d2ec74d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,6 +8,6 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.6" addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.6") addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.6") addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")