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

Jump to bottom

update some versions in reference and tests #1159

Merged
merged 1 commit into from
Sep 19, 2023
Merged

update some versions in reference and tests #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion project/Docs.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Docs {
lazy val targetSbtFullVersion = "1.9.6"
lazy val sbtVersionForScalaDoc = targetSbtFullVersion
lazy val sbtWindowsBuild = targetSbtFullVersion
lazy val scala3ExampleVersion = "3.3.0"
lazy val scala3ExampleVersion = "3.3.1"

lazy val Redirect = config("redirect")
lazy val RedirectTutorial = config("redirect-tutorial")
Expand Down
10 changes: 5 additions & 5 deletions src/reference/00-Getting-Started/02-sbt-by-example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ We can find out the current weather in New York.
```scala
sbt:Hello> console
[info] Starting scala interpreter...
Welcome to Scala 2.13.11 (OpenJDK 64-Bit Server VM, Java 17).
Welcome to Scala 2.13.12 (OpenJDK 64-Bit Server VM, Java 17).
Type in expressions for evaluation. Or try :help.

scala> :paste
Expand Down Expand Up @@ -486,8 +486,8 @@ Change `build.sbt` as follows:
### Switch scalaVersion temporarily

```
sbt:Hello> ++3.3.0!
[info] Forcing Scala version to 3.3.0 on all projects.
sbt:Hello> ++3.3.1!
[info] Forcing Scala version to 3.3.1 on all projects.
[info] Reapplying settings...
[info] Set current project to Hello (in build file:/tmp/foo-build/)
```
Expand All @@ -497,9 +497,9 @@ Check the `scalaVersion` setting:
```
sbt:Hello> scalaVersion
[info] helloCore / scalaVersion
[info] 3.3.0
[info] 3.3.1
[info] scalaVersion
[info] 3.3.0
[info] 3.3.1
```

This setting will go away after `reload`.
Expand Down
10 changes: 5 additions & 5 deletions ...nce/02-DetailTopics/05-Plugins-and-Best-Practices/04-GitHub-Actions-with-sbt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
runs-on: \${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
runs-on: \${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions src/reference/es/00-Getting-Started/02-sbt-by-example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ Podemos averiguar qué tiempo hace actualmente en Nueva York.
```scala
sbt:Hello> console
[info] Starting scala interpreter...
Welcome to Scala 2.13.11 (OpenJDK 64-Bit Server VM, Java 17).
Welcome to Scala 2.13.12 (OpenJDK 64-Bit Server VM, Java 17).
Type in expressions for evaluation. Or try :help.

scala> :paste
Expand Down Expand Up @@ -494,8 +494,8 @@ Cambia `build.sbt` como sigue:
### Cambiar `scalaVersion` temporalmente

```
sbt:Hello> ++3.3.0!
[info] Forcing Scala version to 3.3.0 on all projects.
sbt:Hello> ++3.3.1!
[info] Forcing Scala version to 3.3.1 on all projects.
[info] Reapplying settings...
[info] Set current project to Hello (in build file:/tmp/foo-build/)
```
Expand All @@ -505,9 +505,9 @@ Comprueba la entrada `scalaVersion`:
```
sbt:Hello> scalaVersion
[info] helloCore / scalaVersion
[info] 3.3.0
[info] 3.3.1
[info] scalaVersion
[info] 3.3.0
[info] 3.3.1
```

Esta entrada se esfumará tras un `reload`.
Expand Down
10 changes: 5 additions & 5 deletions src/reference/ja/00-Getting-Started/02-sbt-by-example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ New York の現在の天気を調べてみる:
```scala
sbt:Hello> console
[info] Starting scala interpreter...
Welcome to Scala 2.13.11 (OpenJDK 64-Bit Server VM, Java 17).
Welcome to Scala 2.13.12 (OpenJDK 64-Bit Server VM, Java 17).
Type in expressions for evaluation. Or try :help.

scala> :paste
Expand Down Expand Up @@ -478,8 +478,8 @@ Hello! The current temperature in New York is 22.7 C.
### Switch scalaVersion temporarily

```
sbt:Hello> ++3.3.0!
[info] Forcing Scala version to 3.3.0 on all projects.
sbt:Hello> ++3.3.1!
[info] Forcing Scala version to 3.3.1 on all projects.
[info] Reapplying settings...
[info] Set current project to Hello (in build file:/private/tmp/foo-build/)
```
Expand All @@ -489,9 +489,9 @@ sbt:Hello> ++3.3.0!
```
sbt:Hello> scalaVersion
[info] helloCore / scalaVersion
[info] 3.3.0
[info] 3.3.1
[info] scalaVersion
[info] 3.3.0
[info] 3.3.1
```

このセッティングは `reload` 後には無くなる。
Expand Down
6 changes: 3 additions & 3 deletions src/reference/template.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ windows_app_version=1.9.6

color_scheme=github
example_scala_version=2.12.18
example_scala213=2.13.11
example_scala213=2.13.12
example_scala211=2.11.12
example_scalacheck_version=1.17.0
example_specs2_version=4.20.0
example_scalatest_version=3.2.16
example_akka_version=2.6.20
example_scalatest_version=3.2.17
example_akka_version=2.6.21
example_scala_stm_version=0.9.1
scala_binary_version=2.12
scala_version=2.12.18
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-library/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

lazy val hello = project
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-name/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

lazy val hello = (project in file("."))
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-sub1/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

lazy val hello = project
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-sub2/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

val toolkitTest = "org.scala-lang" %% "toolkit-test" % "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-sub3/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

val toolkitTest = "org.scala-lang" %% "toolkit-test" % "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-sub4/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

val toolkitTest = "org.scala-lang" %% "toolkit-test" % "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-test/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

lazy val hello = project
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-weather/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

val toolkitTest = "org.scala-lang" %% "toolkit-test" % "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-weather/changes/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

val toolkitTest = "org.scala-lang" %% "toolkit-test" % "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/ref/example-weather/changes/build3.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / version := "0.1.0"
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / organization := "com.example"

val toolkitTest = "org.scala-lang" %% "toolkit-test" % "0.1.7"
Expand Down