diff --git a/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala b/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala index c971447113..6e4ac6b26c 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala @@ -18,7 +18,7 @@ final case class SharedJvmOptions( javaHome: Option[String] = None, @Group(HelpGroup.Java.toString) - @HelpMessage("Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. " + + @HelpMessage("Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. " + "scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.") @ValueDescription("jvm-name") @Tag(tags.should) diff --git a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala index 310a0836d4..d998e95dc0 100644 --- a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala +++ b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala @@ -8,14 +8,14 @@ import scala.cli.commands.SpecificationLevel @DirectiveGroupName("JVM version") @DirectiveExamples("//> using jvm 11") -@DirectiveExamples("//> using jvm adopt:11") +@DirectiveExamples("//> using jvm temurin:11") @DirectiveExamples("//> using jvm graalvm:21") @DirectiveUsage( "//> using jvm _value_", "`//> using jvm` _value_" ) @DirectiveDescription( - "Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. " + + "Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. " + "scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs." ) @DirectiveLevel(SpecificationLevel.SHOULD) diff --git a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala index 78719b3690..98dfa4653c 100644 --- a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala +++ b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala @@ -19,7 +19,7 @@ import scala.cli.commands.SpecificationLevel "//> using toolkit _version_", """`//> using toolkit` _version_ | - |//> using test.toolkit` _version_ + |`//> using test.toolkit` _version_ |""".stripMargin ) @DirectiveDescription( diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala index 97fe28b6f1..3ff2499767 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala @@ -43,7 +43,7 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer val exportJsonProc = // Test --power placed after subcommand name - os.proc(TestUtil.cli, "export", "--power", "--json", ".", "--jvm", "adopt:11") + os.proc(TestUtil.cli, "export", "--power", "--json", ".", "--jvm", "temurin:11") .call(cwd = root) val jsonContents = readJson(exportJsonProc.out.text()) @@ -53,7 +53,7 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer |"projectVersion":"1.1.2", |"scalaVersion":"${Constants.scala3Next}", |"platform":"JVM", - |"jvmVersion":"adopt:11", + |"jvmVersion":"temurin:11", |"scopes": { | "main": { | "sources": ["${withEscapedBackslashes(root / "Main.scala")}"], diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 6862b86ad8..901672e0a0 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -673,7 +673,7 @@ Set the Java home directory Aliases: `-j` -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. ### `--jvm-index` diff --git a/website/docs/reference/directives.md b/website/docs/reference/directives.md index b5969491de..9a9f0456bb 100644 --- a/website/docs/reference/directives.md +++ b/website/docs/reference/directives.md @@ -188,14 +188,14 @@ Exclude sources from the project ### JVM version -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. `//> using jvm` _value_ #### Examples `//> using jvm 11` -`//> using jvm adopt:11` +`//> using jvm temurin:11` `//> using jvm graalvm:21` @@ -685,7 +685,7 @@ Use a toolkit as dependency (not supported in Scala 2.12), 'default' version for `//> using toolkit` _version_ -//> using test.toolkit` _version_ +`//> using test.toolkit` _version_ #### Examples diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md index 6e89d6dbff..2d99866ce5 100644 --- a/website/docs/reference/scala-command/cli-options.md +++ b/website/docs/reference/scala-command/cli-options.md @@ -598,7 +598,7 @@ Aliases: `-j` `SHOULD have` per Scala Runner specification -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. ### `--jvm-index` diff --git a/website/docs/reference/scala-command/directives.md b/website/docs/reference/scala-command/directives.md index de36a62838..39124a0be2 100644 --- a/website/docs/reference/scala-command/directives.md +++ b/website/docs/reference/scala-command/directives.md @@ -217,14 +217,14 @@ Exclude sources from the project ### JVM version -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. `//> using jvm` _value_ #### Examples `//> using jvm 11` -`//> using jvm adopt:11` +`//> using jvm temurin:11` `//> using jvm graalvm:21` @@ -479,7 +479,7 @@ Use a toolkit as dependency (not supported in Scala 2.12), 'default' version for `//> using toolkit` _version_ -//> using test.toolkit` _version_ +`//> using test.toolkit` _version_ #### Examples diff --git a/website/docs/reference/scala-command/runner-specification.md b/website/docs/reference/scala-command/runner-specification.md index fae4a41191..862ed1fc25 100644 --- a/website/docs/reference/scala-command/runner-specification.md +++ b/website/docs/reference/scala-command/runner-specification.md @@ -246,7 +246,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -721,7 +721,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -1048,7 +1048,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -1651,7 +1651,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -2280,7 +2280,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -2928,7 +2928,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -3552,7 +3552,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -4213,7 +4213,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -4934,7 +4934,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` @@ -5911,7 +5911,7 @@ Set the Java home directory **--jvm** -Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. +Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs. Aliases: `-j` diff --git a/website/docs/release_notes.md b/website/docs/release_notes.md index db4218d185..aeb9795736 100644 --- a/website/docs/release_notes.md +++ b/website/docs/release_notes.md @@ -4875,7 +4875,7 @@ Added by [@wleczny](https://github.com/wleczny) in [#1505](https://github.com/Vi The `--jvm` option can now be added via using directives, like ```scala -//> using jvm "adopt:11" +//> using jvm "temurin:11" ``` Added by [@lwronski](https://github.com/lwronski) in [#1539](https://github.com/VirtusLab/scala-cli/pull/1539)