diff --git a/gifs/Dockerfile b/gifs/Dockerfile index 0b043adf6c..fc2e32a8d6 100644 --- a/gifs/Dockerfile +++ b/gifs/Dockerfile @@ -16,7 +16,7 @@ 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.9/scala-cli-x86_64-pc-linux.deb +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/ diff --git a/gifs/scenarios/defaults.sh b/gifs/scenarios/defaults.sh index 5389185ae2..4dd890ae57 100755 --- a/gifs/scenarios/defaults.sh +++ b/gifs/scenarios/defaults.sh @@ -11,9 +11,6 @@ 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 " -version = 3.5.8 -runner.dialect = scala3" > .scalafmt.conf scala-cli fmt . # or do other preparation (e.g. create code) else diff --git a/website/docs/cookbooks/gh-action.md b/website/docs/cookbooks/gh-action.md index 994e4344fd..1e75c7ed36 100644 --- a/website/docs/cookbooks/gh-action.md +++ b/website/docs/cookbooks/gh-action.md @@ -73,14 +73,8 @@ jobs: To check the code style of your sources, you can use [Scalafmt](https://scalameta.org/scalafmt/). -Before running Scalafmt, you need to create a `.scalafmt.conf` configuration file: -```scala -version = 3.5.2 -runner.dialect = scala3 -``` - -and then check your code format in GitHub CI by adding new job `format`: +To check your code format in GitHub CI by adding new job `format`: ```yaml format: runs-on: "ubuntu-latest" diff --git a/website/static/img/dark/defaults.svg b/website/static/img/dark/defaults.svg index 97e8c65e1d..b17fd4cab3 100644 --- a/website/static/img/dark/defaults.svg +++ b/website/static/img/dark/defaults.svg @@ -1 +1 @@ -$$c$cat$catMain.scala@main@maindef@maindefhello@maindefhello()@maindefhello()=@maindefhello()={println("Hello"+"world")}$s$scal$scala-$scala-cl$scala-cli$scala-cli.Compilingproject(Scala3.0.2,JVM)Compiledproject(Scala3.0.2,JVM)Helloworld$scala-clifmt.@maindefhello()={println("Hello"+@maindefhello()={println("Hello"+"world")@maindefhello()={println("Hello"+"world")}$scala-clipackage.Wroteapp,runitwith./app$catM$catMai$catMain.$catMain.sc$catMain.scal@maindefhello()={println($scala-clifm$catMa$catMain$catMain.s$catMain.sca@maindefhello()={@maindefhello()={println@maindefhello()={println(@maindefhello()={println("Hello"@maindefhello()={println("Hello"+"world"$sca$scala$scala-c$scala-clipa$scala-clipack$scala-clipackag$scala-clipackage \ No newline at end of file +$$c$cat$catMa$catMain$catMain.s$catMain.sca$catMain.scala@main@maindef@maindefhello()={println("Hello"+"world")}$sc$scal$scala-$scala-cl$scala-cli$scala-cli.Compilingproject(Scala3.2.0,JVM)Compiledproject(Scala3.2.0,JVM)Helloworld$scala-clifmt.@maindefhello()={println("Hello"+"world")}$scala-clipackage.Wrote/data/hello,runitwith./hello@maindefhello()={println$s$sca$scala$scala-c$scala-clifm$scala-clifmt@maindefhello()={@maindefhello()={println($scala-clipa$scala-clipac$scala-clipacka$scala-clipackage \ No newline at end of file diff --git a/website/static/img/dark/gifs/defaults.gif b/website/static/img/dark/gifs/defaults.gif index aed9e78e3f..745374aa3d 100644 Binary files a/website/static/img/dark/gifs/defaults.gif and b/website/static/img/dark/gifs/defaults.gif differ diff --git a/website/static/img/defaults.svg b/website/static/img/defaults.svg index fe3877fe82..d57c98d2be 100644 --- a/website/static/img/defaults.svg +++ b/website/static/img/defaults.svg @@ -1 +1 @@ -$$c$cat$catMain.scala@main@maindef@maindefhello@maindefhello()@maindefhello()=@maindefhello()={println("Hello"+"world")}$s$scal$scala-$scala-cl$scala-cli$scala-cli.Compilingproject(Scala3.0.2,JVM)Compiledproject(Scala3.0.2,JVM)Helloworld$scala-clifmt.@maindefhello()={println("Hello"+@maindefhello()={println("Hello"+"world")@maindefhello()={println("Hello"+"world")}$scala-clipackage.Wroteapp,runitwith./app$catM$catMai$catMain.$catMain.sc$catMain.scal@maindefhello()={println($scala-clifm$catMa$catMain$catMain.s$catMain.sca@maindefhello()={@maindefhello()={println@maindefhello()={println(@maindefhello()={println("Hello"@maindefhello()={println("Hello"+"world"$sca$scala$scala-c$scala-clipa$scala-clipack$scala-clipackag$scala-clipackage \ No newline at end of file +$$c$cat$catMa$catMain$catMain.s$catMain.sca$catMain.scala@main@maindef@maindefhello()={println("Hello"+"world")}$sc$scal$scala-$scala-cl$scala-cli$scala-cli.Compilingproject(Scala3.2.0,JVM)Compiledproject(Scala3.2.0,JVM)Helloworld$scala-clifmt.@maindefhello()={println("Hello"+"world")}$scala-clipackage.Wrote/data/hello,runitwith./hello@maindefhello()={println$s$sca$scala$scala-c$scala-clifm$scala-clifmt@maindefhello()={@maindefhello()={println($scala-clipa$scala-clipac$scala-clipacka$scala-clipackage \ No newline at end of file diff --git a/website/static/img/gifs/defaults.gif b/website/static/img/gifs/defaults.gif index 9501bd8905..6d73d5a397 100644 Binary files a/website/static/img/gifs/defaults.gif and b/website/static/img/gifs/defaults.gif differ