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 2.13 to 2.13.13 #2755

Merged
merged 3 commits into from
Feb 27, 2024
Merged

Bump Scala 2.13 to 2.13.13 #2755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fb5ab4
Bump Scala 2.13 to 2.13.13
Gedochao Feb 23, 2024
b58c17d
Adjust stack trace tests for 2.13.13
Gedochao Feb 26, 2024
c777e3e
Don't test nightly Scala CLI versions in docs' tests
Gedochao Feb 27, 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
22 changes: 22 additions & 0 deletions modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,28 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
|${tab}at throws$$.something(throws.sc:2)
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3)
|$tab... 10 more""".stripMargin.linesIterator.toVector
else if (actualScalaVersion.coursierVersion >= ("2.13.13".coursierVersion))
s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6)
|${tab}at throws$$delayedInit$$body.apply(throws.sc:65534)
|${tab}at scala.Function0.apply$$mcV$$sp(Function0.scala:42)
|${tab}at scala.Function0.apply$$mcV$$sp$$(Function0.scala:42)
|${tab}at scala.runtime.AbstractFunction0.apply$$mcV$$sp(AbstractFunction0.scala:17)
|${tab}at scala.App.$$anonfun$$main$$1(App.scala:98)
|${tab}at scala.App.$$anonfun$$main$$1$$adapted(App.scala:98)
|${tab}at scala.collection.IterableOnceOps.foreach(IterableOnce.scala:619)
|${tab}at scala.collection.IterableOnceOps.foreach$$(IterableOnce.scala:617)
|${tab}at scala.collection.AbstractIterable.foreach(Iterable.scala:935)
|${tab}at scala.App.main(App.scala:98)
|${tab}at scala.App.main$$(App.scala:96)
|${tab}at throws$$.main(throws.sc:65534)
|${tab}at throws.main(throws.sc)
|Caused by: java.lang.RuntimeException: nope
|${tab}at scala.sys.package$$.error(package.scala:27)
|${tab}at throws$$.something(throws.sc:2)
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3)
|$tab... 13 more
|""".stripMargin.linesIterator.toVector
else
s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6)
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 @@ -2,7 +2,7 @@ import mill._, scalalib._

object Scala {
def scala212 = "2.12.19"
def scala213 = "2.13.12"
def scala213 = "2.13.13"
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.2" // the LTS version currently used in the build
Expand Down Expand Up @@ -46,7 +46,7 @@ object Scala {
}

def maxAmmoniteScala212Version = "2.12.18"
def maxAmmoniteScala213Version = scala213
def maxAmmoniteScala213Version = "2.13.12"
def maxAmmoniteScala3Version = "3.3.1"
lazy val listMaxAmmoniteScalaVersion =
Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
Expand Down
2 changes: 1 addition & 1 deletion website/docs/commands/basics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ To use the latest Scala CLI nightly build, pass `nightly` to `--cli-version` par

<ChainedSnippets>

```bash
```bash ignore
scala-cli --cli-version nightly version
```

Expand Down
2 changes: 1 addition & 1 deletion website/docs/guides/introduction/old-runner-migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ sub-command.

For example, to call [the `package` sub-command](../../commands/package.md) using the nightly CLI version, do it like this:

```bash
```bash ignore
scala-cli --cli-version nightly package --help
```

Expand Down
2 changes: 1 addition & 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 @@ -21,5 +21,5 @@ it is recommended to update scala-cli.
| 1.0.0 - 1.0.1 | 3.3.0 | 2.13.10 | 2.12.17 |
| 1.0.1 - 1.0.4 | 3.3.0 | 2.13.11 | 2.12.18 |
| 1.0.5 - 1.1.3 | 3.3.1 | 2.13.12 | 2.12.18 |
| 1.2.0 - current | 3.4.0 | 2.13.12 | 2.12.19 |
| 1.2.0 - current | 3.4.0 | 2.13.13 | 2.12.19 |

Loading