diff --git a/build.sbt b/build.sbt index 9e05e7bc..08847499 100644 --- a/build.sbt +++ b/build.sbt @@ -54,6 +54,9 @@ val previousVersion: Option[String] = Some("3.0.0") lazy val mimaSettings = Seq( mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet, mimaBinaryIssueFilters ++= Seq( + // Switch to jakarta inject + ProblemFilters.exclude[MissingTypesProblem]("play.api.libs.ws.ahc.AhcWSClientConfigParser"), + ProblemFilters.exclude[MissingTypesProblem]("play.api.libs.ws.WSConfigParser"), ) ) diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java index 27226888..355bb4f4 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java @@ -31,7 +31,7 @@ import scala.concurrent.Future; import scala.concurrent.Promise; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala index eee74378..de0795fb 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala @@ -4,9 +4,9 @@ package play.api.libs.ws.ahc -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Provider +import jakarta.inject.Singleton import javax.net.ssl._ import com.typesafe.config.Config diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala index 50008719..6d6d4873 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala @@ -5,7 +5,7 @@ package play.api.libs.ws.ahc import org.apache.pekko.Done -import javax.inject.Inject +import jakarta.inject.Inject import org.apache.pekko.stream.Materializer import org.apache.pekko.stream.scaladsl.Source import org.apache.pekko.util.ByteString diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala index f0a8106c..08a2f96c 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala @@ -4,9 +4,9 @@ package play.api.libs.ws -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Provider +import jakarta.inject.Singleton import com.typesafe.config.Config import com.typesafe.config.ConfigException diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 348420b7..a785b8e7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "2.0.16") - val javaxInject = Seq("javax.inject" % "javax.inject" % "1") + val jakartaInject = Seq("jakarta.inject" % "jakarta.inject-api" % "2.0.1") val sslConfigCore = Seq("com.typesafe" %% "ssl-config-core" % "0.6.1") @@ -67,7 +67,7 @@ object Dependencies { val testDependencies = (mockito ++ specsBuild ++ junitInterface ++ assertj ++ awaitility ++ slf4jtest ++ logback).map(_ % Test) - val standaloneApiWSDependencies = javaxInject ++ sslConfigCore ++ pekkoStreams ++ testDependencies + val standaloneApiWSDependencies = jakartaInject ++ sslConfigCore ++ pekkoStreams ++ testDependencies val standaloneAhcWSDependencies = cachecontrol ++ slf4jApi ++ reactiveStreams ++ testDependencies