From e855bb3a1d816b82bfba0df3b16cd3d7e2ebde9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Tue, 24 Sep 2024 11:55:59 +0200
Subject: [PATCH] docs: Default Scala quickstart to Scala 3, test on both 3 and
 2.13 (#4405)

---
 .github/workflows/check-samples.yml          | 5 +++--
 samples/akka-http-quickstart-scala/build.sbt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml
index 6bd70d4939..aeb5ea4753 100644
--- a/.github/workflows/check-samples.yml
+++ b/.github/workflows/check-samples.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Publish artifacts locally
         run: |-
-          sbt "publishLocal; publishM2"
+          sbt "+publishLocal; publishM2"
 
       - name: Test akka-http-quickstart-java
         run: |-
@@ -63,7 +63,8 @@ jobs:
       - name: Test akka-http-quickstart-scala
         run: |-
           cd samples/akka-http-quickstart-scala
-          sbt test -Dakka-http.version=`cat ~/.version`
+          sbt "++2.13.14!; test;" -Dakka-http.version=`cat ~/.version`
+          sbt "clean; test;" -Dakka-http.version=`cat ~/.version`
 
       - name: Email on failure
         if: ${{ failure() }}
diff --git a/samples/akka-http-quickstart-scala/build.sbt b/samples/akka-http-quickstart-scala/build.sbt
index 07492d726c..ef8cc830bd 100644
--- a/samples/akka-http-quickstart-scala/build.sbt
+++ b/samples/akka-http-quickstart-scala/build.sbt
@@ -13,7 +13,7 @@ lazy val root = (project in file(".")).
   settings(
     inThisBuild(List(
       organization    := "com.example",
-      scalaVersion    := "2.13.14"
+      scalaVersion    := "3.3.3"
     )),
     name := "akka-http-quickstart",
     libraryDependencies ++= Seq(