From 4da79c316d50b67f8ac8d6628af0329e5f6c858c Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Tue, 4 Feb 2025 06:48:39 +0000
Subject: [PATCH 1/2] Update scala3-library, ... to 3.3.5

---
 build.sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index c6ec30f..3351cdb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "3.3.4"
+ThisBuild / scalaVersion := "3.3.5"
 ThisBuild / crossScalaVersions := Seq((ThisBuild / scalaVersion).value, "2.13.16")
 
 lazy val root = project.in(file("."))
@@ -32,7 +32,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform, NativePlatfor
           "-Xsource:3-cross",
           )
         case _            => Seq(
-          "-Wconf:cat=deprecation:s", // Scala 3 lacks origin, src arrives in 3.3.4 & 3.5
+          "-Wconf:cat=deprecation:s", // Scala 3 lacks origin, src arrives in 3.3.5 & 3.5
           "-Wconf:id=E175:s",
           "-Werror",
           "-Wnonunit-statement", // warns on uni-limbed if

From 2f959617900d3cfc749bd0d263d67bcc17652311 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 13 Feb 2025 12:50:06 -0800
Subject: [PATCH 2/2] clean up build for Scala 3.3.5

---
 build.sbt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 3351cdb..46c6f03 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,12 +18,14 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform, NativePlatfor
     name := "scala-collection-contrib",
     versionPolicyIntention := Compatibility.None,
     scalaModuleAutomaticModuleName := Some("scala.collection.contrib"),
+    Compile / compile / scalacOptions ++= Seq(
+      "-Werror",
+      "-Wnonunit-statement",
+      "-Wconf:origin=scala.collection.IterableOps.toIterable:s", // internal usage; annotating @nowarn is clutter
+    ),
     Compile / compile / scalacOptions ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, _)) => Seq(
-          "-Wconf:origin=scala.collection.IterableOps.toIterable:s", // internal usage; annotating @nowarn is clutter
-          "-Werror",
-          "-Wnonunit-statement",
           "-Wopt",
           "-opt:inline:<sources>",
           "-opt:inline:scala.util.package$chaining$,scala.util.ChainingSyntax,scala.util.ChainingOps$",
@@ -32,10 +34,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform, NativePlatfor
           "-Xsource:3-cross",
           )
         case _            => Seq(
-          "-Wconf:cat=deprecation:s", // Scala 3 lacks origin, src arrives in 3.3.5 & 3.5
           "-Wconf:id=E175:s",
-          "-Werror",
-          "-Wnonunit-statement", // warns on uni-limbed if
           )
       }
     },