From bae85c550e5342ea05a31982492c05889199f19e Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Mon, 9 Dec 2024 14:46:09 +0100 Subject: [PATCH 1/2] Bump Scala Next to 3.6.2 --- project/deps.sc | 4 ++-- website/docs/reference/cli-options.md | 2 +- .../reference/scala-command/cli-options.md | 2 +- .../scala-command/runner-specification.md | 18 +++++++++--------- website/docs/reference/scala-versions.md | 3 ++- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/project/deps.sc b/project/deps.sc index 59dcd20c6d..9997148ec8 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -8,9 +8,9 @@ object Scala { 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.4" // the LTS version currently used in the build - def scala3NextPrefix = "3.5" + def scala3NextPrefix = "3.6" def scala3Next = s"$scala3NextPrefix.2" // the newest/next version of Scala - def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced + def scala3NextAnnounced = "3.5.2" // the newest/next version of Scala that's been announced def scala3NextRc = "3.6.2-RC3" // the latest RC version of Scala Next def scala3NextRcAnnounced = scala3NextRc // the latest RC version of Scala Next diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 0adaf108c4..4532998af5 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -1561,7 +1561,7 @@ Available in commands: Aliases: `-S`, `--scala` -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) ### `--scala-binary-version` diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md index c7f5fbb59e..fe08c17191 100644 --- a/website/docs/reference/scala-command/cli-options.md +++ b/website/docs/reference/scala-command/cli-options.md @@ -996,7 +996,7 @@ Aliases: `-S`, `--scala` `MUST have` per Scala Runner specification -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) ### `--scala-binary-version` diff --git a/website/docs/reference/scala-command/runner-specification.md b/website/docs/reference/scala-command/runner-specification.md index fd2e59f22d..0a16b3abb3 100644 --- a/website/docs/reference/scala-command/runner-specification.md +++ b/website/docs/reference/scala-command/runner-specification.md @@ -92,7 +92,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -861,7 +861,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -1450,7 +1450,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -2059,7 +2059,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -2687,7 +2687,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -3303,7 +3303,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -3938,7 +3938,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -4636,7 +4636,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` @@ -5569,7 +5569,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.2 by default) +Set the Scala version (3.6.2 by default) Aliases: `-S` ,`--scala` diff --git a/website/docs/reference/scala-versions.md b/website/docs/reference/scala-versions.md index 0c04baf2f7..bdeb08df35 100644 --- a/website/docs/reference/scala-versions.md +++ b/website/docs/reference/scala-versions.md @@ -27,5 +27,6 @@ it is recommended to update scala-cli. | 1.3.2 - 1.4.3 | 3.4.2 | 2.13.14 | 2.12.19 | | 1.5.0 | 3.5.0 | 2.13.14 | 2.12.19 | | 1.5.1 | 3.5.1 | 2.13.15 | 2.12.20 | -| 1.5.2 - current | 3.5.2 | 2.13.15 | 2.12.20 | +| 1.5.2 - 1.5.4 | 3.5.2 | 2.13.15 | 2.12.20 | +| 1.6.0 - current | 3.6.2 | 2.13.15 | 2.12.20 | From 384aa6798ec6424c5451cafc0f23bbfbf69ec476 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Tue, 10 Dec 2024 10:28:45 +0100 Subject: [PATCH 2/2] Make sure `scalafix` tests support Scala minor version bumps --- .../scala/scala/cli/integration/ScalafixTestDefinitions.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/integration/src/test/scala/scala/cli/integration/ScalafixTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/ScalafixTestDefinitions.scala index 1232eaf106..488b40d2f1 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ScalafixTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ScalafixTestDefinitions.scala @@ -276,6 +276,7 @@ abstract class ScalafixTestDefinitions extends ScalaCliSuite with TestScalaVersi s"""|rules = [ | ExplicitResultTypes |] + |ExplicitResultTypes.fetchScala3CompilerArtifactsOnVersionMismatch = true |""".stripMargin, os.rel / "Hello.scala" -> original )