Skip to content

Commit 90d7f5c

Browse files
bio-aeoncb372
andauthored
Update Scala, plugins and dependencies versions (#492)
* Update Scala, plugins and dependencies versions * Fix warnings in mdoc --------- Co-authored-by: Chris Birchall <[email protected]>
1 parent c59fc4d commit 90d7f5c

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

build.sbt

+18-13
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import sbtcrossproject.CrossPlugin.autoImport.crossProject
2-
import _root_.io.github.davidgregory084.TpolecatPlugin.autoImport._
2+
import _root_.org.typelevel.sbt.tpolecat.TpolecatPlugin.autoImport._
3+
import _root_.org.typelevel.scalacoptions.ScalacOptions
34

4-
lazy val scalaVersion212 = "2.12.17"
5-
lazy val scalaVersion213 = "2.13.10"
6-
lazy val scalaVersion3 = "3.2.1"
5+
lazy val scalaVersion212 = "2.12.19"
6+
lazy val scalaVersion213 = "2.13.13"
7+
lazy val scalaVersion3 = "3.3.3"
78
lazy val scalaVersions = List(scalaVersion212, scalaVersion213, scalaVersion3)
89

910
inThisBuild(
@@ -35,11 +36,11 @@ inThisBuild(
3536
)
3637
)
3738

38-
val catsVersion = "2.9.0"
39-
val catsEffectVersion = "3.4.2"
40-
val catsMtlVersion = "1.3.0"
41-
val scalatestVersion = "3.2.14"
42-
val scalaTestPlusVersion = "3.2.14.0"
39+
val catsVersion = "2.10.0"
40+
val catsEffectVersion = "3.5.4"
41+
val catsMtlVersion = "1.4.0"
42+
val scalatestVersion = "3.2.18"
43+
val scalaTestPlusVersion = "3.2.18.0"
4344
val scalacheckVersion = "1.17.0"
4445
val disciplineVersion = "2.2.0"
4546

@@ -60,7 +61,8 @@ val core = crossProject(JVMPlatform, JSPlatform)
6061
mimaPreviousArtifacts := Set(
6162
"com.github.cb372" %%% "cats-retry" % "3.1.0"
6263
),
63-
tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses
64+
tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses,
65+
Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement
6466
)
6567
.jsSettings(
6668
// work around https://github.com/typelevel/sbt-tpolecat/issues/102
@@ -86,7 +88,8 @@ val alleycatsRetry = crossProject(JVMPlatform, JSPlatform)
8688
),
8789
mimaPreviousArtifacts := Set(
8890
"com.github.cb372" %%% "alleycats-retry" % "3.1.0"
89-
)
91+
),
92+
Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement
9093
)
9194
.jsSettings(
9295
tpolecatScalacOptions += ScalacOptions
@@ -109,7 +112,8 @@ val mtlRetry = crossProject(JVMPlatform, JSPlatform)
109112
mimaPreviousArtifacts := Set(
110113
"com.github.cb372" %%% "cats-retry-mtl" % "3.1.0"
111114
),
112-
tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses
115+
tpolecatExcludeOptions += ScalacOptions.lintPackageObjectClasses,
116+
Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement
113117
)
114118
.jsSettings(
115119
// work around https://github.com/typelevel/sbt-tpolecat/issues/102
@@ -125,9 +129,10 @@ val docs = project
125129
.enablePlugins(MicrositesPlugin, BuildInfoPlugin)
126130
.settings(
127131
addCompilerPlugin(
128-
"org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full
132+
"org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full
129133
),
130134
tpolecatExcludeOptions ++= ScalacOptions.warnUnusedOptions,
135+
tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement,
131136
crossScalaVersions := Nil,
132137
buildInfoPackage := "retry",
133138
publishArtifact := false,

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.0
1+
sbt.version=1.9.8

project/plugins.sbt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.0")
2-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
3-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
5-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
1+
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4")
2+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
3+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
5+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
66
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
7-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
8-
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1")
7+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
8+
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")

0 commit comments

Comments
 (0)