Back port of documentation changes to main

gifs/Dockerfile

@@ -1,24 +1,22 @@
 FROM ubuntu:20.04
 
 RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get update &&\
-    DEBIAN_FRONTEND=noninteractive apt-get install -y pv curl clang rubygems nodejs python3-pip &&\
+RUN apt-get update
+RUN apt-get install openjdk-17-jdk openjdk-17-jre -y
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y pv curl clang rubygems nodejs python3-pip &&\
     rm -rf /var/lib/apt/lists/* &&\
     gem install rouge &&\
     pip3 install asciinema==2.1.0
 
 RUN mkdir /data
 WORKDIR /data
 
+COPY scala-cli-jvm /usr/bin/scala-cli
 # Preload scala-cli
 RUN cd /data
 RUN echo 'def a = 123' > a.scala
 RUN scala-cli compile a.scala || echo "Problems with bloop"
 
-# Update path to point to newer version
-RUN curl -fLo scala-cli.deb https://github.com/VirtusLab/scala-cli/releases/download/v0.1.15/scala-cli-x86_64-pc-linux.deb
-RUN dpkg -i scala-cli.deb
-
 COPY *.sh /data/
 COPY scenarios /data/scenarios
 

gifs/scenarios/complete-install.sh

@@ -10,7 +10,8 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 
 if [[ -z "${ASCIINEMA_REC}" ]]; then
   # Warm up scala-cli
-  apt-get purge -y scala-cli || true
+  rm /usr/bin/scala-cli || true # remove scala-cliu from PATH
+  rm /usr/bin/java || true # remove java from PATH
   # or do other preparation (e.g. create code)
 else
   . $SCRIPT_DIR/../demo-magic.sh

gifs/scenarios/defaults.sh

@@ -27,7 +27,7 @@ EOF
   pe 'scala-cli fmt .'
   p "cat Main.scala"
   rougify --theme tulip Main.scala
-  pe 'scala-cli package .'
+  pe 'scala-cli --power package .'
   doSleep 4
   echo " " && echo "ok" > status.txt
 fi

gifs/scenarios/demo.sh

@@ -11,8 +11,8 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 if [[ -z "${ASCIINEMA_REC}" ]]; then
   # Warm up scala-cli
   echo "println(1)" | scala-cli -
-  cat <<EOF > demo.test.scala | 
-//> using lib "org.scalameta::munit:0.7.29"
+  cat <<EOF > demo.test.scala |
+//> using dep "org.scalameta::munit:0.7.29"
 EOF
   scala-cli test demo.test.scala
   # or do other preparation (e.g. create code)
@@ -56,7 +56,7 @@ EOF
   clearConsole
 
   cat <<EOF | updateFile demo.test.scala
-//> using lib "org.scalameta::munit:0.7.29"
+//> using dep "org.scalameta::munit:0.7.29"
 
 class demoTest extends munit.FunSuite {
   test("test nice args") {

gifs/scenarios/powerful_scripts.sh

@@ -10,8 +10,8 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 
 if [[ -z "${ASCIINEMA_REC}" ]]; then
   # Warm up scala-cli
-    echo '//> using lib "com.lihaoyi::os-lib:0.7.8"' | scala-cli -
-    echo '//> using lib "com.lihaoyi::pprint:0.6.6"' | scala-cli -
+    echo '//> using dep "com.lihaoyi::os-lib:0.9.1"' | scala-cli -
+    echo '//> using dep "com.lihaoyi::pprint:0.8.1"' | scala-cli -
   # or do other preparation (e.g. create code)
 else
   . $SCRIPT_DIR/../demo-magic.sh
@@ -20,8 +20,8 @@ else
 
   # Put your stuff here
   cat <<EOF | updateFile stat.sc
-//> using lib "com.lihaoyi::os-lib:0.7.8"
-//> using lib "com.lihaoyi::pprint:0.6.6"
+//> using dep "com.lihaoyi::os-lib:0.9.1"
+//> using dep "com.lihaoyi::pprint:0.8.1"
 import pprint._
 import os._
 

gifs/scenarios/projects.sh

@@ -11,7 +11,8 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 if [[ -z "${ASCIINEMA_REC}" ]]; then
   # Warm up scala-cli
   echo "println(1)" | scala-cli -S 2.13.6 -
-  echo "//> using lib \"com.softwaremill.sttp.client3::core:3.3.18\" " | scala-cli -S 2.13.6  -
+  echo "//> using dep \"com.softwaremill.sttp.client3::core:3.8.13\" " | scala-cli -S 2.13.6  -
+  scala-cli config suppress-warning.outdated-dependencies-files true
   # or do other preparation (e.g. create code)
 else
   . $SCRIPT_DIR/../demo-magic.sh
@@ -20,7 +21,7 @@ else
 
   # Put your stuff here
   cat <<EOF | updateFile Post.scala
-//> using lib "com.softwaremill.sttp.client3::core:3.3.18"
+//> using dep "com.softwaremill.sttp.client3::core:3.3.18"
 import sttp.client3._
 
 // https://sttp.softwaremill.com/en/latest/quickstart.html

gifs/scenarios/scripting.sh

@@ -11,7 +11,7 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 if [[ -z "${ASCIINEMA_REC}" ]]; then
   # Warm up scala-cli
   echo "println(1)" | scala-cli -
-  echo "//> using lib \"com.lihaoyi::os-lib::0.7.8\"" | scala-cli  -
+  echo "//> using dep \"com.lihaoyi::os-lib::0.9.1\"" | scala-cli  -
   # or do other preparation (e.g. create code)
 else
   . $SCRIPT_DIR/../demo-magic.sh
@@ -24,7 +24,7 @@ Hello World from file
 EOF
 
   cat <<EOF | updateFile script.sc
-//> using lib "com.lihaoyi::os-lib::0.7.8"
+//> using dep "com.lihaoyi::os-lib::0.9.1"
 
 val filePath = os.pwd / "file"
 val fileContent = os.read(filePath)

gifs/scenarios/todo.sh

@@ -18,7 +18,7 @@ else
 
   # Put your stuff here
 
-  pe "scala-cli about"
+  pe "scala-cli version"
   pe "echo 'println(\"TODO\")' | scala-cli -"
 
   # Wait a bit to read output of last command

modules/docs-tests/src/test/scala/sclicheck/DocTests.scala

@@ -12,7 +12,7 @@ class DocTests extends munit.FunSuite {
     DocTestEntry("reference", docsRootPath / "reference")
   )
 
-  val options: Options = Options(scalaCliCommand = Seq(TestUtil.scalaCliPath))
+  val options: Options = Options(scalaCliCommand = Seq(TestUtil.scalaCliPath.toString))
 
   private def lineContainsAnyChecks(l: String): Boolean =
     l.startsWith("```md") || l.startsWith("```bash") ||

modules/docs-tests/src/test/scala/sclicheck/GifTests.scala

@@ -29,7 +29,7 @@ class GifTests extends munit.FunSuite {
   lazy val ttyOpts = if (hasTty) Seq("-it") else Nil
 
   def buildImages      = true
-  def forceBuildImages = false
+  def forceBuildImages = true
 
   def columns = 70
   def rows    = 20
@@ -44,8 +44,11 @@ class GifTests extends munit.FunSuite {
         res.out.trim().nonEmpty
       }
       if (forceBuildImages || !hasImage("gif-renderer"))
+        val scalaCliJvmPath = gifRenderedDockerDir / "scala-cli-jvm"
+        os.copy.over(TestUtil.scalaCliPath, scalaCliJvmPath)
         os.proc("docker", "build", gifRenderedDockerDir, "--tag", "gif-renderer")
           .call(stdin = os.Inherit, stdout = os.Inherit)
+        os.remove(scalaCliJvmPath)
       if (forceBuildImages || !hasImage("svg_rendrer"))
         os.proc("docker", "build", svgRenderedDockerDir, "--tag", "svg_rendrer")
           .call(stdin = os.Inherit, stdout = os.Inherit)

modules/docs-tests/src/test/scala/sclicheck/TestUtil.scala

@@ -15,8 +15,9 @@ object TestUtil {
         System.err.println(s"Could not remove $f ($ex), ignoring it.")
     }
 
-  lazy val scalaCliPath = Option(System.getenv("SCLICHECK_SCALA_CLI")).getOrElse {
-    sys.error("SCLICHECK_SCALA_CLI not set")
-  }
+  lazy val scalaCliPath =
+    Option(System.getenv("SCLICHECK_SCALA_CLI")).map(os.Path(_, os.pwd)).getOrElse {
+      sys.error("SCLICHECK_SCALA_CLI not set")
+    }
 
 }