From e6294a37446199e564f1f80d4481fb17e0bfb8a3 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 3 May 2023 14:18:33 -0700 Subject: [PATCH 1/2] upgrade to Scala 3.3.0 and enable unused warnings --- build.sbt | 3 ++- .../scala/scala/util/parsing/combinator/LongestMatchTest.scala | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 9c498a56..3e02d167 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.10", "2.12.17", "3.2.2"), + crossScalaVersions := Seq("2.13.10", "2.12.17", "3.3.0"), scalaVersion := crossScalaVersions.value.head, ) @@ -39,6 +39,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor // not sure what resolving this would look like? didn't think about it too hard "-Wconf:site=scala.util.parsing.combinator.lexical.StdLexical.*&cat=other-match-analysis:i", ) + case Some((3, _)) => Seq("Wunused:all") case _ => Seq() }), Compile / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { diff --git a/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala index f9dca807..58ea29ed 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala @@ -2,7 +2,6 @@ package scala.util.parsing.combinator import java.io.StringReader -import scala.util.parsing.combinator.Parsers import scala.util.parsing.input.StreamReader import org.junit.Test From 669f390a3873c1a23dd52538e26f26d77894e0f9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 3 May 2023 14:32:51 -0700 Subject: [PATCH 2/2] relax compatibility policy for next minor release --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3e02d167..35f99e00 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,9 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), - versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, + // change back to BinaryAndSourceCompatible after next minor release; + // the Scala 3.2 -> 3.3 upgrade requires a minor version bump + versionPolicyIntention := Compatibility.BinaryCompatible, crossScalaVersions := Seq("2.13.10", "2.12.17", "3.3.0"), scalaVersion := crossScalaVersions.value.head, )