diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f928fd0..87c8eaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,24 +9,27 @@ on: jobs: build-test: if: github.repository == 'apache/pekko-http-quickstart-scala.g8' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Java 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 11 + - name: Install sbt + uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 + - name: Cache Coursier cache - uses: coursier/cache-action@v6 + uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7 - name: sbt & Paradox run: sbt test docs/paradox - - name: generate and test, Scala 3 + - name: generate and test, Scala 2.13 run: |- - sbt new file://$PWD --name=hello-world --scala_version=3.3.1 --force && pushd hello-world && sbt test + sbt new file://$PWD --name=hello-world --scala_version=2.13.16 --force && pushd hello-world && sbt test diff --git a/project/build.properties b/project/build.properties index 0b699c3..5e6884d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.11.6 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 7c3e0a8..e8e4bcb 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -19,7 +19,7 @@ lazy val root = (project in file(".")). "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion, "org.apache.pekko" %% "pekko-actor-typed" % pekkoVersion, "org.apache.pekko" %% "pekko-stream" % pekkoVersion, - "ch.qos.logback" % "logback-classic" % "1.3.14", + "ch.qos.logback" % "logback-classic" % "1.3.15", "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test, "org.apache.pekko" %% "pekko-actor-testkit-typed" % pekkoVersion % Test, diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 4d1b8aa..98ec382 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,8 +1,8 @@ name=My Pekko HTTP Project description=This is a seed project which creates a basic build for a Pekko HTTP application using Scala. -scala_version=2.13.15 -pekko_http_version=1.1.0 -pekko_version=1.1.2 +scala_version=3.3.6 +pekko_http_version=1.2.0 +pekko_version=1.2.0 sbt_version=maven(org.scala-sbt, sbt, stable) organization=com.example package=$organization$