Skip to content

Commit

Permalink
Bump Scala Next to 3.5.2 (#3230)
Browse files Browse the repository at this point in the history
* Bump Scala Next to 3.5.2

* Increase the timeout for `checks` to 30 minutes
  • Loading branch information
Gedochao authored Oct 22, 2024
1 parent db69091 commit fd960bb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
18 changes: 9 additions & 9 deletions website/docs/reference/scala-command/runner-specification.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down
3 changes: 2 additions & 1 deletion website/docs/reference/scala-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

0 comments on commit fd960bb

Please sign in to comment.