Skip to content

Commit

Permalink
Update Scala 3 Next to 3.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gedochao
Gedochao committed Aug 14, 2024
1 parent c0382e8 commit e299a44
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 18 deletions.
14 changes: 8 additions & 6 deletions project/deps.sc
View file
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.3" // the LTS version currently used in the build
def scala3Next = "3.4.2" // the newest/next version of Scala
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
def scala3Next = "3.5.0" // the newest/next version of Scala
def scala3NextAnnounced = "3.4.2" // the newest/next version of Scala that's been announced
def scala3NextRc = "3.5.0-RC7" // the latest RC version of Scala Next

// The Scala version used to build the CLI itself.
Expand Down Expand Up @@ -39,19 +39,21 @@ object Scala {
val max31 = 3
val max32 = 2
val max33 = patchVer(scala3Lts)
val max34 = patchVer(scala3Next)
val max34 = 3
val max35 = patchVer(scala3Next)
(8 until max212).map(i => s"2.12.$i") ++ Seq(scala212) ++
(0 until max213).map(i => s"2.13.$i") ++ Seq(scala213) ++
(0 to max30).map(i => s"3.0.$i") ++
(0 to max31).map(i => s"3.1.$i") ++
(0 to max32).map(i => s"3.2.$i") ++
(0 until max33).map(i => s"3.3.$i") ++
(0 until max34).map(i => s"3.4.$i") ++ Seq(scala3Next)
(0 to max33).map(i => s"3.3.$i") ++
(0 to max34).map(i => s"3.4.$i") ++
(0 until max35).map(i => s"3.5.$i") ++ Seq(scala3Next)
}

def maxAmmoniteScala212Version = scala212
def maxAmmoniteScala213Version = scala213
def maxAmmoniteScala3Version = scala3Next
def maxAmmoniteScala3Version = scala3NextAnnounced
lazy val listMaxAmmoniteScalaVersion =
Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
lazy val listAllAmmonite = {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/cli-options.md
View file
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.4.2 by default)
Set the Scala version (3.5.0 by default)

### `--scala-binary-version`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/cli-options.md
View file
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.4.2 by default)
Set the Scala version (3.5.0 by default)

### `--scala-binary-version`

Expand Down
18 changes: 9 additions & 9 deletions website/docs/reference/scala-command/runner-specification.md
View file
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.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -861,7 +861,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -1450,7 +1450,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -2059,7 +2059,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -2687,7 +2687,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -3303,7 +3303,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -3938,7 +3938,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -4636,7 +4636,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -5569,7 +5569,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.4.2 by default)
Set the Scala version (3.5.0 by default)

Aliases: `-S` ,`--scala`

Expand Down
3 changes: 2 additions & 1 deletion website/docs/reference/scala-versions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ it is recommended to update scala-cli.
| 1.2.0 - 1.2.1 | 3.4.0 | 2.13.13 | 2.12.19 |
| 1.2.1 - 1.3.0 | 3.4.1 | 2.13.13 | 2.12.19 |
| 1.3.1 | 3.4.1 | 2.13.14 | 2.12.19 |
| 1.3.2 - current | 3.4.2 | 2.13.14 | 2.12.19 |
| 1.3.2 - 1.4.3 | 3.4.2 | 2.13.14 | 2.12.19 |
| 1.5.0 - current | 3.5.0 | 2.13.14 | 2.12.19 |

0 comments on commit e299a44

Please sign in to comment.