Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Scala Next to 3.6.2 #3358

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Bump Scala Next to 3.6.2 #3358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bae85c5
Bump Scala Next to 3.6.2
Gedochao Dec 9, 2024
384aa67
Make sure `scalafix` tests support Scala minor version bumps
Gedochao Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/integration/src/test/scala/scala/cli/integration/ScalafixTestDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ abstract class ScalafixTestDefinitions extends ScalaCliSuite with TestScalaVersi
s"""|rules = [
| ExplicitResultTypes
|]
|ExplicitResultTypes.fetchScala3CompilerArtifactsOnVersionMismatch = true
Gedochao marked this conversation as resolved.
Show resolved Hide resolved
|""".stripMargin,
os.rel / "Hello.scala" -> original
)
Expand Down
4 changes: 2 additions & 2 deletions project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

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

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

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

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

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