wip

Author: xuwei-k

.github/workflows/build-test.yml

@@ -4,8 +4,6 @@ on:
   pull_request:
 
   push:
-    branches:
-      - main # Check branch after merge
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
@@ -42,7 +40,7 @@ jobs:
       cmd: |
         # Clone generated docs so that we can run some integration tests
         git clone -o origin https://github.com/playframework/play-generated-docs.git $PWD/data/generated
-        sbt ++$MATRIX_SCALA scalafmtSbtCheck scalafmtCheckAll test
+        sbt --server ++$MATRIX_SCALA scalafmtSbtCheck scalafmtCheckAll test
 
   finish:
     name: Finish

app/actors/Actors.scala

@@ -5,7 +5,7 @@ import java.io.File
 import com.google.inject.AbstractModule
 import com.typesafe.config.Config
 import jakarta.inject.Inject
-import javax.inject.Provider
+import jakarta.inject.Provider
 import jakarta.inject.Singleton
 import models.documentation._
 import org.slf4j.LoggerFactory

app/controllers/documentation/Router.scala

@@ -1,7 +1,7 @@
 package controllers.documentation
 
 import jakarta.inject.Inject
-import javax.inject.Provider
+import jakarta.inject.Provider
 import jakarta.inject.Singleton
 import play.api.i18n.Lang
 import play.api.routing.sird._

app/services/releases/ReleasesModule.scala

@@ -1,6 +1,6 @@
 package services.releases
 
-import javax.inject.Provider
+import jakarta.inject.Provider
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
 

build.sbt

@@ -3,7 +3,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := "3.3.7"
+scalaVersion := "3.8.3"
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
 
 libraryDependencies ++= Seq(
@@ -25,11 +25,6 @@ routesGenerator := InjectedRoutesGenerator
 
 JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
 
-Assets / StylusKeys.useNib   := true
-Assets / StylusKeys.compress := true
-
-pipelineStages := Seq(digest, gzip)
-
 Compile / sourceGenerators += Def.task {
   import scala.sys.process._
   val siteVersionFile = crossTarget.value / "version" / "SiteVersion.scala"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.12.9
+sbt.version=2.0.0-RC11

project/plugins.sbt

@@ -1,5 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin"   % "3.0.10")
-addSbtPlugin("com.github.sbt"    % "sbt-digest"   % "2.1.0")
-addSbtPlugin("com.github.sbt"    % "sbt-gzip"     % "2.0.0")
-addSbtPlugin("com.github.sbt"    % "sbt-stylus"   % "2.0.1")
-addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.5.6")
+addSbtPlugin("org.playframework" % "sbt-plugin"   % "3.1.0-M5")