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.

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

Scala 2.13.4 #10544

Merged
merged 1 commit into from
Nov 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions documentation/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ lazy val main = Project("Play-Documentation", file("."))
unmanagedResourceDirectories in Test ++= (baseDirectory.value / "manual" / "detailedTopics" ** "code").get,
// Don't include sbt files in the resources
excludeFilter in (Test, unmanagedResources) := (excludeFilter in (Test, unmanagedResources)).value || "*.sbt",
crossScalaVersions := Seq("2.13.2", "2.12.11"),
scalaVersion := "2.13.2",
crossScalaVersions := Seq("2.13.4", "2.12.11"),
scalaVersion := "2.13.4",
fork in Test := true,
javaOptions in Test ++= Seq("-Xmx512m", "-Xms128m"),
headerLicense := Some(HeaderLicense.Custom("Copyright (C) Lightbend Inc. <https://www.lightbend.com>")),
Expand Down
2 changes: 1 addition & 1 deletion documentation/manual/hacking/BuildingFromSource.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ This will build and publish Play for the default Scala version. If you want to p
Or to publish for a specific Scala version:

```bash
> ++ 2.13.2 publishLocal
> ++ 2.13.4 publishLocal
```

## Build the documentation
Expand Down
2 changes: 1 addition & 1 deletion documentation/manual/releases/release27/Highlights27.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ scalaVersion := "2.11.12"
For Scala 2.13:

```scala
scalaVersion := "2.13.2"
scalaVersion := "2.13.4"
```

## Lifecycle managed by Akka's Coordinated Shutdown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ Play 2.8 support Scala 2.12 and 2.13, but not 2.11, which has reached its end of
To set the Scala version in sbt, simply set the `scalaVersion` key, for example:

```scala
scalaVersion := "2.13.2"
scalaVersion := "2.13.4"
```

If you have a single project build, then this setting can just be placed on its own line in `build.sbt`. However, if you have a multi-project build, then the scala version setting must be set on each project. Typically, in a multi-project build, you will have some common settings shared by every project, this is the best place to put the setting, for example:

```scala
def commonSettings = Seq(
scalaVersion := "2.13.2"
scalaVersion := "2.13.4"
)

val projectA = (project in file("projectA"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ If you use `groupID %% artifactID % revision` rather than `groupID % artifactID

@[explicit-scala-version-dep](code/dependencies.sbt)

Assuming the `scalaVersion` for your build is `2.13.2`, the following is identical (note the double `%%` after `"org.scala-tools"`):
Assuming the `scalaVersion` for your build is `2.13.4`, the following is identical (note the double `%%` after `"org.scala-tools"`):

@[auto-scala-version-dep](code/dependencies.sbt)

Expand Down