Merge pull request #4129 from Gedochao/maintenance/misccherrypicks0213

Cherry pick #4073, #4072 & #4123 to the `stable` branch

Author: Gedochao

.github/workflows/ci.yml

@@ -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)

modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.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)

modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.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(

modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.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")}"],

modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala

@@ -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`
 

website/docs/reference/cli-options.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

website/docs/reference/directives.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`
 

website/docs/reference/scala-command/cli-options.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

website/docs/reference/scala-command/directives.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`