Skip to content

Commit c0d9150

Browse files
committed
Use toolkit lib in all build tools
1 parent c53b084 commit c0d9150

File tree

4 files changed

+53
-19
lines changed

4 files changed

+53
-19
lines changed

_includes/_markdown/install-munit.md

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,26 @@ You can require the entire toolkit in a single line:
77
//> using toolkit "latest"
88
```
99

10-
Alternatively, you can require a specific version of MUnit:
10+
Alternatively, you can require just a specific version of MUnit:
1111
```scala
1212
//> using dep "org.scalameta::munit:1.0.0-M7"
1313
```
1414
{% endtab %}
1515
{% tab 'sbt' %}
16-
In your build.sbt file, you can add the dependency to the MUnit library:
16+
In your build.sbt file, you can add the dependency on toolkit-test:
1717
```scala
1818
lazy val example = project.in(file("example"))
1919
.settings(
2020
scalaVersion := "3.2.2",
21-
libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M7" % Test
21+
libraryDependencies += "org.scala-lang" %% "toolkit-test" % "0.1.7" % Test
2222
)
2323
```
24-
Here the `Test` configuration means that this dependency is only used by the source files in the `example/src/test` directory.
25-
This is where you can put your test suites.
24+
Here the `Test` configuration means that the dependency is only used by the source files in `example/src/test`.
25+
26+
Alternatively, you can require just a specific version of MUnit:
27+
```scala
28+
libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M7" % Test
29+
```
2630
{% endtab %}
2731
{% tab 'Mill' %}
2832
In your build.sc file, you can add a `test` object extending `Tests` and `TestModule.Munit`:
@@ -32,11 +36,16 @@ object example extends ScalaModule {
3236
object test extends Tests with TestModule.Munit {
3337
def ivyDeps =
3438
Agg(
35-
ivy"org.scalameta::munit::1.0.0-M7"
39+
ivy"org.scala-lang::toolkit-test:0.1.7"
3640
)
3741
}
3842
}
3943
```
44+
45+
Alternatively, you can require just a specific version of MUnit:
46+
```scala
47+
ivy"org.scalameta::munit:1.0.0-M7"
48+
```
4049
{% endtab %}
4150
{% endtabs %}
4251
{% endaltDetails %}

_includes/_markdown/install-os-lib.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,34 @@ Alternatively, you can require just a specific version of OS-Lib:
1313
```
1414
{% endtab %}
1515
{% tab 'sbt' %}
16-
In our `build.sbt` file, we add the dependency on OS-Lib:
16+
In your `build.sbt`, you can add a dependency on the toolkit:
1717
```scala
1818
lazy val example = project.in(file("example"))
1919
.settings(
2020
scalaVersion := "3.2.2",
21-
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.9.1"
21+
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"
2222
)
2323
```
24+
Alternatively, you can require just a specific version of OS-Lib:
25+
```scala
26+
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.9.1"
27+
```
2428
{% endtab %}
2529
{% tab 'Mill' %}
26-
In our `build.sc` file, we add the dependency on OS-Lib:
30+
In your `build.sc` file, you can add a dependency on the Toolkit:
2731
```scala
2832
object example extends ScalaModule {
2933
def scalaVersion = "3.2.2"
3034
def ivyDeps =
3135
Agg(
32-
ivy"com.lihaoyi::os-lib:0.9.1"
36+
ivy"org.scala-lang::toolkit:0.1.7"
3337
)
3438
}
3539
```
40+
Alternatively, you can require just a specific version of OS-Lib:
41+
```scala
42+
ivy"com.lihaoyi::os-lib:0.9.1"
43+
```
3644
{% endtab %}
3745
{% endtabs %}
3846
{% endaltDetails %}

_includes/_markdown/install-sttp.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,41 @@ You can require the entire toolkit in a single line:
77
//> using toolkit "latest"
88
```
99

10-
Alternatively, you can require a specific version of sttp:
10+
Alternatively, you can require just a specific version of sttp:
1111
```scala
1212
//> using dep "com.softwaremill.sttp.client4::core:4.0.0-M1"
1313
```
1414
{% endtab %}
1515
{% tab 'sbt' %}
16-
In your build.sbt file, you can add the dependency to the sttp library:
16+
In your build.sbt file, you can add a dependency on the Toolkit:
1717
```scala
1818
lazy val example = project.in(file("example"))
1919
.settings(
2020
scalaVersion := "3.2.2",
21-
libraryDependencies += "com.softwaremill.sttp.client4" %% "core" % "4.0.0-M1"
21+
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"
2222
)
2323
```
24+
25+
Alternatively, you can require just a specific version of sttp:
26+
```scala
27+
libraryDependencies += "com.softwaremill.sttp.client4" %% "core" % "4.0.0-M1"
28+
```
2429
{% endtab %}
2530
{% tab 'Mill' %}
26-
In your build.sc file, you can add the dependency to the sttp library:
31+
In your build.sc file, you can add a dependency on the Toolkit:
2732
```scala
2833
object example extends ScalaModule {
2934
def scalaVersion = "3.2.2"
3035
def ivyDeps =
3136
Agg(
32-
ivy"com.softwaremill.sttp.client4::core:4.0.0-M1"
37+
ivy"org.scala-lang::toolkit:0.1.7"
3338
)
3439
}
3540
```
41+
Alternatively, you can require just a specific version of sttp:
42+
```scala
43+
ivy"com.softwaremill.sttp.client4::core:4.0.0-M1"
44+
```
3645
{% endtab %}
3746
{% endtabs %}
3847
{% endaltDetails %}

_includes/_markdown/install-upickle.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@ Using Scala CLI, you can require the entire toolkit in a single line:
77
//> using toolkit "latest"
88
```
99

10-
Alternatively, you can require a specific version of upickle:
10+
Alternatively, you can require just a specific version of UPickle:
1111
```scala
1212
//> using dep "com.lihaoyi::upickle:3.1.0
1313
```
1414
{% endtab %}
1515
{% tab 'sbt' %}
16-
In your build.sbt file, you can add the dependency to the upickle library:
16+
In your build.sbt file, you can add the dependency on the Toolkit:
1717
```scala
1818
lazy val example = project.in(file("example"))
1919
.settings(
2020
scalaVersion := "3.2.2",
21-
libraryDependencies += "com.lihaoyi" %% "upickle" % "3.1.0"
21+
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"
2222
)
2323
```
24+
Alternatively, you can require just a specific version of UPickle:
25+
```scala
26+
libraryDependencies += "com.lihaoyi" %% "upickle" % "3.1.0"
27+
```
2428
{% endtab %}
2529
{% tab 'Mill' %}
2630
In your build.sc file, you can add the dependency to the upickle library:
@@ -29,10 +33,14 @@ object example extends ScalaModule {
2933
def scalaVersion = "3.2.2"
3034
def ivyDeps =
3135
Agg(
32-
ivy"com.lihaoyi::upickle:3.1.0"
36+
ivy"org.scala-lang::toolkit:0.1.7"
3337
)
3438
}
3539
```
40+
Alternatively, you can require just a specific version of UPickle:
41+
```scala
42+
ivy"com.lihaoyi::upickle:3.1.0"
43+
```
3644
{% endtab %}
3745
{% endtabs %}
3846
{% endaltDetails %}

0 commit comments

Comments
 (0)