Skip to content

Commit

Permalink
Merge pull request #3125 from SethTisue/remove-extra-quotes
Browse files Browse the repository at this point in the history
modernize using syntax, bump versions
  • Loading branch information
gkepka authored Dec 10, 2024
2 parents 70efd3e + 077140a commit a234ad8
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions _includes/_markdown/install-cask.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% tab 'Scala CLI' %}
You can declare a dependency on Cask with the following `using` directive:
```scala
//> using dep "com.lihaoyi::cask::0.9.2"
//> using dep com.lihaoyi::cask::0.9.2
```
{% endtab %}

Expand All @@ -25,7 +25,7 @@ lazy val example = project.in(file("example"))
In your `build.sc`, you can add a dependency on Cask:
```scala
object example extends RootModule with ScalaModule {
def scalaVersion = "3.3.3"
def scalaVersion = "3.3.4"
def ivyDeps = Agg(
ivy"com.lihaoyi::cask::0.9.2"
)
Expand Down
10 changes: 5 additions & 5 deletions _includes/_markdown/install-munit.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ MUnit, being a testing framework, is only available in test files: files in a `t

Alternatively, you can require just a specific version of MUnit:
```scala
//> using dep org.scalameta::munit:1.0.0-M7
//> using dep org.scalameta::munit:1.0.3
```
{% endtab %}
{% tab 'sbt' %}
In your build.sbt file, you can add the dependency on toolkit-test:
```scala
lazy val example = project.in(file("."))
.settings(
scalaVersion := "3.3.3",
scalaVersion := "3.3.4",
libraryDependencies += "org.scala-lang" %% "toolkit-test" % "0.1.7" % Test
)
```
Expand All @@ -27,14 +27,14 @@ Here the `Test` configuration means that the dependency is only used by the sour

Alternatively, you can require just a specific version of MUnit:
```scala
libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M7" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.3" % Test
```
{% endtab %}
{% tab 'Mill' %}
In your build.sc file, you can add a `test` object extending `Tests` and `TestModule.Munit`:
```scala
object example extends ScalaModule {
def scalaVersion = "3.3.3"
def scalaVersion = "3.3.4"
object test extends Tests with TestModule.Munit {
def ivyDeps =
Agg(
Expand All @@ -46,7 +46,7 @@ object example extends ScalaModule {

Alternatively, you can require just a specific version of MUnit:
```scala
ivy"org.scalameta::munit:1.0.0-M7"
ivy"org.scalameta::munit:1.0.3"
```
{% endtab %}
{% endtabs %}
Expand Down
4 changes: 2 additions & 2 deletions _includes/_markdown/install-os-lib.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In your `build.sbt`, you can add a dependency on the toolkit:
```scala
lazy val example = project.in(file("."))
.settings(
scalaVersion := "3.3.3",
scalaVersion := "3.3.4",
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"
)
```
Expand All @@ -30,7 +30,7 @@ libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.9.1"
In your `build.sc` file, you can add a dependency on the Toolkit:
```scala
object example extends ScalaModule {
def scalaVersion = "3.3.3"
def scalaVersion = "3.3.4"
def ivyDeps =
Agg(
ivy"org.scala-lang::toolkit:0.1.7"
Expand Down
4 changes: 2 additions & 2 deletions _includes/_markdown/install-sttp.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In your build.sbt file, you can add a dependency on the Toolkit:
```scala
lazy val example = project.in(file("."))
.settings(
scalaVersion := "3.3.3",
scalaVersion := "3.3.4",
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"
)
```
Expand All @@ -31,7 +31,7 @@ libraryDependencies += "com.softwaremill.sttp.client4" %% "core" % "4.0.0-M6"
In your build.sc file, you can add a dependency on the Toolkit:
```scala
object example extends ScalaModule {
def scalaVersion = "3.3.3"
def scalaVersion = "3.3.4"
def ivyDeps =
Agg(
ivy"org.scala-lang::toolkit:0.1.7"
Expand Down
4 changes: 2 additions & 2 deletions _includes/_markdown/install-upickle.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In your build.sbt file, you can add the dependency on the Toolkit:
```scala
lazy val example = project.in(file("."))
.settings(
scalaVersion := "3.3.3",
scalaVersion := "3.3.4",
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"
)
```
Expand All @@ -30,7 +30,7 @@ libraryDependencies += "com.lihaoyi" %% "upickle" % "3.1.0"
In your build.sc file, you can add the dependency to the upickle library:
```scala
object example extends ScalaModule {
def scalaVersion = "3.3.3"
def scalaVersion = "3.3.4"
def ivyDeps =
Agg(
ivy"org.scala-lang::toolkit:0.1.7"
Expand Down
4 changes: 2 additions & 2 deletions _overviews/FAQ/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ with only minor supplements. That's why `versionString` and
`versionNumberString` report that Scala 2 is in use:

```
Welcome to Scala 3.3.3 (17.0.3, Java OpenJDK 64-Bit Server VM).
Welcome to Scala 3.3.4 (17.0.3, Java OpenJDK 64-Bit Server VM).
Type in expressions for evaluation. Or try :help.
scala> util.Properties.versionNumberString
val res0: String = 2.13.12
val res0: String = 2.13.15
```

Note that even the latest Scala 3 version might not use the very
Expand Down
2 changes: 1 addition & 1 deletion _overviews/contribute/bug-reporting-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ If you cannot find your issue in the issue tracker, create a new bug. The detail

Please make sure to fill in as many fields as possible. Make sure you've indicated the following:

1. **Exact Scala version** that you are using. For example, `2.13.15` or `3.3.3`. If the bug happens in multiple versions indicate all of them.
1. **Exact Scala version** that you are using. For example, `2.13.15` or `3.3.4`. If the bug happens in multiple versions indicate all of them.
2. **The component** that is affected by the bug. For example, the Standard Library, Scaladoc, etc.
3. **Labels** related to your issue. For example, if you think your issue is related to the typechecker, and if you have successfully minimized your issue, label your bug as "typechecker" and "minimized". Issue tracker will suggest names for existing labels as you type them so try not to create duplicates.
4. **Running environment**. Are you running on Linux? Windows? What JVM version are you using?
Expand Down
4 changes: 2 additions & 2 deletions _overviews/toolkit/web-server-dynamic.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Import the Scalatags library:
{% tab 'Scala CLI' %}
Add the Scalatags dependency in `Example.sc` file:
```scala
//> using dep "com.lihaoyi::scalatags::0.13.1"
//> using dep com.lihaoyi::scalatags::0.13.1
```
{% endtab %}
{% tab 'sbt' %}
Expand Down Expand Up @@ -234,4 +234,4 @@ object Example extends cask.MainRoutes:
{% endtabs %}

Here we get the text of the response and wrap it in a Scalatags template. Notice that the return type changed from `String`
to `doctype`.
to `doctype`.
6 changes: 3 additions & 3 deletions _sips/sips/scala-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ Currently, when reporting a bug in the compiler (or any other Scala-related) rep
"Using directives", provided by Scala CLI give the ability to include the whole configuration in single file, for example:

```scala
//> using platform "native"
//> using "com.lihaoyi::os-lib:0.7.8"
//> using options "-Xfatal-warnings"
//> using platform native
//> using dep com.lihaoyi::os-lib:0.7.8
//> using options -Xfatal-warnings

def foo = println("<here comes the buggy warning with Scala Native and os-lib>")
```
Expand Down

0 comments on commit a234ad8

Please sign in to comment.