Skip to content

Commit 860b588

Browse files
authored
Merge pull request #3016 from SethTisue/fix-toolkit-sbt-instructions
in Toolkit sbt example, avoid having two subprojects
2 parents e3078bb + b91f2a9 commit 860b588

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

_includes/_markdown/install-munit.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ Alternatively, you can require just a specific version of MUnit:
1616
{% tab 'sbt' %}
1717
In your build.sbt file, you can add the dependency on toolkit-test:
1818
```scala
19-
lazy val example = project.in(file("example"))
19+
lazy val example = project.in(file("."))
2020
.settings(
2121
scalaVersion := "3.3.3",
2222
libraryDependencies += "org.scala-lang" %% "toolkit-test" % "0.1.7" % Test
2323
)
2424
```
25-
Here the `Test` configuration means that the dependency is only used by the source files in `example/src/test`.
25+
26+
Here the `Test` configuration means that the dependency is only used by the source files in `src/test`.
2627

2728
Alternatively, you can require just a specific version of MUnit:
2829
```scala

_includes/_markdown/install-os-lib.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of OS-Lib:
1515
{% tab 'sbt' %}
1616
In your `build.sbt`, you can add a dependency on the toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-sttp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of sttp:
1515
{% tab 'sbt' %}
1616
In your build.sbt file, you can add a dependency on the Toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-upickle.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of UPickle:
1515
{% tab 'sbt' %}
1616
In your build.sbt file, you can add the dependency on the Toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_overviews/toolkit/testing-run-only.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ scala-cli test example --test-only example.MyTests
2222
{% tab 'sbt' %}
2323
To run a single `example.MyTests` suite in sbt, use the `testOnly` task:
2424
```
25-
sbt:example> example/testOnly example.MyTests
25+
sbt:example> testOnly example.MyTests
2626
```
2727
{% endtab %}
2828
{% tab 'Mill' %}

_overviews/toolkit/testing-run.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ scala-cli test example
2727
{% tab 'sbt' %}
2828
In the sbt shell, the following command runs all the tests of the project `example`:
2929
```
30-
sbt:example> example/test
30+
sbt:example> test
3131
# MyTests:
3232
# + sum of two integers 0.006s
3333
# [info] Passed: Total 1, Failed 0, Errors 0, Passed 1
@@ -74,7 +74,7 @@ test("failing test") {
7474
```
7575
# MyTests:
7676
# + sum of two integers 0.008s
77-
# ==> X MyTests.failing test 0.015s munit.ComparisonFailException: ./example/MyTests.test.scala:13
77+
# ==> X MyTests.failing test 0.015s munit.ComparisonFailException: ./MyTests.test.scala:13
7878
# 12: val expected = 4
7979
# 13: assertEquals(obtained, expected)
8080
# 14: }

0 commit comments

Comments
 (0)