Skip to content

Commit 8ca41ef

Browse files
authored
Merge pull request #273 from scala-steward/update/scala3-library-3.3.5
Update scala3-library, ... to 3.3.5
2 parents e561c10 + 2f95961 commit 8ca41ef

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

build.sbt

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ThisBuild / scalaVersion := "3.3.4"
1+
ThisBuild / scalaVersion := "3.3.5"
22
ThisBuild / crossScalaVersions := Seq((ThisBuild / scalaVersion).value, "2.13.16")
33

44
lazy val root = project.in(file("."))
@@ -18,12 +18,14 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform, NativePlatfor
1818
name := "scala-collection-contrib",
1919
versionPolicyIntention := Compatibility.None,
2020
scalaModuleAutomaticModuleName := Some("scala.collection.contrib"),
21+
Compile / compile / scalacOptions ++= Seq(
22+
"-Werror",
23+
"-Wnonunit-statement",
24+
"-Wconf:origin=scala.collection.IterableOps.toIterable:s", // internal usage; annotating @nowarn is clutter
25+
),
2126
Compile / compile / scalacOptions ++= {
2227
CrossVersion.partialVersion(scalaVersion.value) match {
2328
case Some((2, _)) => Seq(
24-
"-Wconf:origin=scala.collection.IterableOps.toIterable:s", // internal usage; annotating @nowarn is clutter
25-
"-Werror",
26-
"-Wnonunit-statement",
2729
"-Wopt",
2830
"-opt:inline:<sources>",
2931
"-opt:inline:scala.util.package$chaining$,scala.util.ChainingSyntax,scala.util.ChainingOps$",
@@ -32,10 +34,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform, NativePlatfor
3234
"-Xsource:3-cross",
3335
)
3436
case _ => Seq(
35-
"-Wconf:cat=deprecation:s", // Scala 3 lacks origin, src arrives in 3.3.4 & 3.5
3637
"-Wconf:id=E175:s",
37-
"-Werror",
38-
"-Wnonunit-statement", // warns on uni-limbed if
3938
)
4039
}
4140
},

0 commit comments

Comments
 (0)