From b2bb6d2133be1955a0d6f621dee147c53ab3e95a Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Wed, 25 Sep 2024 16:04:15 +0200 Subject: [PATCH 1/2] Update Scala 3 LTS to 3.3.4 --- project/deps.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/deps.sc b/project/deps.sc index b4d854ed10..39db2fe8e5 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -7,7 +7,7 @@ object Scala { def scala213 = "2.13.15" def runnerScala3 = "3.0.2" // the newest version that is compatible with all Scala 3.x versions def scala3LtsPrefix = "3.3" // used for the LTS version tags - def scala3Lts = s"$scala3LtsPrefix.3" // the LTS version currently used in the build + def scala3Lts = s"$scala3LtsPrefix.4" // the LTS version currently used in the build def scala3Next = "3.5.1" // the newest/next version of Scala def scala3NextAnnounced = "3.5.0" // the newest/next version of Scala that's been announced def scala3NextRc = "3.5.2-RC1" // the latest RC version of Scala Next From 6c3ec0c01fe5ce5ebbd258b3959be4fc67b3a407 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Thu, 26 Sep 2024 13:04:00 +0200 Subject: [PATCH 2/2] Disable tests relying on Ammonite for Scala 3 LTS --- .../src/test/scala/scala/cli/integration/ReplTests3Lts.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala b/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala index bec611690f..a962387ef2 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala @@ -1,6 +1,3 @@ package scala.cli.integration -class ReplTests3Lts extends ReplTestDefinitions - with ReplAmmoniteTestDefinitions - with ReplAmmoniteTests3StableDefinitions - with Test3Lts +class ReplTests3Lts extends ReplTestDefinitions with Test3Lts