diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 974a32c530..6a818da4f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1477,7 +1477,7 @@ jobs: path: test-report.xml checks: - timeout-minutes: 15 + timeout-minutes: 30 runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 diff --git a/project/deps.sc b/project/deps.sc index 01782bcd60..7b4f836561 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -8,8 +8,8 @@ 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 scala3Next = "3.5.1" // the newest/next version of Scala - def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced + def scala3Next = "3.5.2" // the newest/next version of Scala + def scala3NextAnnounced = "3.5.1" // the newest/next version of Scala that's been announced def scala3NextRc = "3.5.2-RC2" // the latest RC version of Scala Next // The Scala version used to build the CLI itself. diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index b53962df79..21c6393bfa 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -1533,7 +1533,7 @@ Available in commands: Aliases: `-S`, `--scala` -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.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 57c2aeb438..74a3a4d2ab 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.1 by default) +Set the Scala version (3.5.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 65a8d4725c..a396241d92 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.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -861,7 +861,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -1450,7 +1450,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -2059,7 +2059,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -2687,7 +2687,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -3303,7 +3303,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -3938,7 +3938,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -4636,7 +4636,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` @@ -5569,7 +5569,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.5.1 by default) +Set the Scala version (3.5.2 by default) Aliases: `-S` ,`--scala` diff --git a/website/docs/reference/scala-versions.md b/website/docs/reference/scala-versions.md index 8a3d9324c6..0c04baf2f7 100644 --- a/website/docs/reference/scala-versions.md +++ b/website/docs/reference/scala-versions.md @@ -26,5 +26,6 @@ it is recommended to update scala-cli. | 1.3.1 | 3.4.1 | 2.13.14 | 2.12.19 | | 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 - current | 3.5.1 | 2.13.15 | 2.12.20 | +| 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 |