From 90d7f5c15e143d05c75f04c54024e45ec594f4be Mon Sep 17 00:00:00 2001 From: Alexandr Date: Thu, 14 Mar 2024 21:44:25 +0300 Subject: [PATCH] Update Scala, plugins and dependencies versions (#492) * Update Scala, plugins and dependencies versions * Fix warnings in mdoc --------- Co-authored-by: Chris Birchall --- build.sbt | 31 ++++++++++++++++++------------- project/build.properties | 2 +- project/plugins.sbt | 14 +++++++------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/build.sbt b/build.sbt index 532a524..e187e6e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,10 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject -import _root_.io.github.davidgregory084.TpolecatPlugin.autoImport._ +import _root_.org.typelevel.sbt.tpolecat.TpolecatPlugin.autoImport._ +import _root_.org.typelevel.scalacoptions.ScalacOptions -lazy val scalaVersion212 = "2.12.17" -lazy val scalaVersion213 = "2.13.10" -lazy val scalaVersion3 = "3.2.1" +lazy val scalaVersion212 = "2.12.19" +lazy val scalaVersion213 = "2.13.13" +lazy val scalaVersion3 = "3.3.3" lazy val scalaVersions = List(scalaVersion212, scalaVersion213, scalaVersion3) inThisBuild( @@ -35,11 +36,11 @@ inThisBuild( ) ) -val catsVersion = "2.9.0" -val catsEffectVersion = "3.4.2" -val catsMtlVersion = "1.3.0" -val scalatestVersion = "3.2.14" -val scalaTestPlusVersion = "3.2.14.0" +val catsVersion = "2.10.0" +val catsEffectVersion = "3.5.4" +val catsMtlVersion = "1.4.0" +val scalatestVersion = "3.2.18" +val scalaTestPlusVersion = "3.2.18.0" val scalacheckVersion = "1.17.0" val disciplineVersion = "2.2.0" @@ -60,7 +61,8 @@ val core = crossProject(JVMPlatform, JSPlatform) mimaPreviousArtifacts := Set( "com.github.cb372" %%% "cats-retry" % "3.1.0" ), - tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses + tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses, + Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement ) .jsSettings( // work around https://github.com/typelevel/sbt-tpolecat/issues/102 @@ -86,7 +88,8 @@ val alleycatsRetry = crossProject(JVMPlatform, JSPlatform) ), mimaPreviousArtifacts := Set( "com.github.cb372" %%% "alleycats-retry" % "3.1.0" - ) + ), + Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement ) .jsSettings( tpolecatScalacOptions += ScalacOptions @@ -109,7 +112,8 @@ val mtlRetry = crossProject(JVMPlatform, JSPlatform) mimaPreviousArtifacts := Set( "com.github.cb372" %%% "cats-retry-mtl" % "3.1.0" ), - tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses + tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses, + Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement ) .jsSettings( // work around https://github.com/typelevel/sbt-tpolecat/issues/102 @@ -125,9 +129,10 @@ val docs = project .enablePlugins(MicrositesPlugin, BuildInfoPlugin) .settings( addCompilerPlugin( - "org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full + "org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full ), tpolecatExcludeOptions ++= ScalacOptions.warnUnusedOptions, + tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement, crossScalaVersions := Nil, buildInfoPackage := "retry", publishArtifact := false, diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..abbbce5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.9.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index b5b7fd2..dc6783b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") +addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")