From d6560dc45fff3312428dede435285b7b6a2f5535 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:59:23 -0700 Subject: [PATCH] Scalameta: upgrade to v4.9.3 --- project/Dependencies.scala | 2 +- .../test/scala/org/scalafmt/cli/CliTest.scala | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d8182c578a..7e45ed997a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ object Dependencies { val metaconfigV = "0.12.0" - val scalametaV = "4.9.2" + val scalametaV = "4.9.3" val scalacheckV = "1.17.0" val coursier = "2.1.2" val munitV = "0.7.29" diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/cli/CliTest.scala b/scalafmt-tests/src/test/scala/org/scalafmt/cli/CliTest.scala index 85775ec359..c02cc2d3f9 100644 --- a/scalafmt-tests/src/test/scala/org/scalafmt/cli/CliTest.scala +++ b/scalafmt-tests/src/test/scala/org/scalafmt/cli/CliTest.scala @@ -660,12 +660,10 @@ trait CliTestBehavior { this: AbstractCliTest => Seq(Array("--test", "--config-str", s"""{version="$version"}""")), assertOut = out => { assert( - out.contains( - s"foo.scala:2: error:$dialectError } expected but end of file found" - ) && - out.contains( - "error: ParseError=2" - ) + out.contains(s"foo.scala:2: error:$dialectError") && + out.contains("end of file") && + out.contains("error: ParseError=2"), + out ) } ) @@ -686,11 +684,10 @@ trait CliTestBehavior { this: AbstractCliTest => ExitCode.ParseError, assertOut = out => { assert( - out.contains( - s"foo.scala:2: error:$dialectError } expected but end of file found" - ) && out.contains( - "error: ParseError=2" - ) + out.contains(s"foo.scala:2: error:$dialectError") && + out.contains(s"end of file") && + out.contains("error: ParseError=2"), + out ) } )