Fix main branch: jakarta.inject, Play 3.1.0-M4, Java 25

.github/workflows/build-test.yml

@@ -17,7 +17,7 @@ jobs:
     name: Tests
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 21, 17
+      java: 25, 21, 17
       scala: 2.13.x, 3.x
       cmd: |
         sbt ++$MATRIX_SCALA test

project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")

src/main/scala/org/webjars/play/RequireJS.scala

@@ -3,7 +3,7 @@ package org.webjars.play
 import play.api.http.MimeTypes
 import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents}
 
-import javax.inject.{Inject, Singleton}
+import jakarta.inject.{Inject, Singleton}
 
 @Singleton
 class RequireJS @Inject() (webJarsUtil: WebJarsUtil, controllerComponents: ControllerComponents)

src/main/scala/org/webjars/play/WebJarAssets.scala

@@ -7,7 +7,7 @@ import play.api.Environment
 import play.api.http.HttpErrorHandler
 import play.api.mvc.{Action, AnyContent}
 
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 // this is needed to avoid conflicts with the controllers.Assets controller
 class WebJarAssets @Inject() (errorHandler: HttpErrorHandler, assetsMetadata: AssetsMetadata, env: Environment) extends controllers.AssetsBuilder(errorHandler, assetsMetadata, env) {

src/main/scala/org/webjars/play/WebJarsUtil.scala

@@ -1,6 +1,6 @@
 package org.webjars.play
 
-import javax.inject.{Inject, Singleton}
+import jakarta.inject.{Inject, Singleton}
 import org.webjars.WebJarVersionLocator
 import play.api.mvc.Call
 import play.api.{Configuration, Environment, Logging, Mode}

test-project/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M1")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")