diff --git a/app/actors/Actors.scala b/app/actors/Actors.scala index 1ca53a99..cd026eee 100644 --- a/app/actors/Actors.scala +++ b/app/actors/Actors.scala @@ -4,9 +4,9 @@ import java.io.File import com.google.inject.AbstractModule import com.typesafe.config.Config -import javax.inject.Inject +import jakarta.inject.Inject import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Singleton import models.documentation._ import org.slf4j.LoggerFactory import play.api._ diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index 4bfbf0b5..0737cbc1 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -2,8 +2,8 @@ package controllers import java.io.InputStream -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import models._ import org.apache.commons.io.IOUtils import play.api._ diff --git a/app/controllers/Blog.scala b/app/controllers/Blog.scala index f7f01101..2d863a85 100644 --- a/app/controllers/Blog.scala +++ b/app/controllers/Blog.scala @@ -2,8 +2,8 @@ package controllers import java.io.InputStream -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import models._ import org.apache.commons.io.IOUtils import play.api._ diff --git a/app/controllers/Code.scala b/app/controllers/Code.scala index 6a559e1c..10bbb89e 100644 --- a/app/controllers/Code.scala +++ b/app/controllers/Code.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import play.api.mvc.AbstractController import play.api.mvc.ControllerComponents diff --git a/app/controllers/Modules.scala b/app/controllers/Modules.scala index 87184e7b..b6142296 100644 --- a/app/controllers/Modules.scala +++ b/app/controllers/Modules.scala @@ -1,7 +1,7 @@ package controllers -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import play.api.mvc._ import play.api.libs.json._ import services.modules._ diff --git a/app/controllers/Outreachy.scala b/app/controllers/Outreachy.scala index 8f6eda92..af9529be 100644 --- a/app/controllers/Outreachy.scala +++ b/app/controllers/Outreachy.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import play.api.mvc.AbstractController import play.api.mvc.ControllerComponents diff --git a/app/controllers/Security.scala b/app/controllers/Security.scala index bfe13cfa..767f0f7c 100644 --- a/app/controllers/Security.scala +++ b/app/controllers/Security.scala @@ -1,7 +1,7 @@ package controllers -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import play.api.mvc.BaseController import play.api.mvc.ControllerComponents diff --git a/app/controllers/documentation/DocumentationController.scala b/app/controllers/documentation/DocumentationController.scala index 4508ba65..12d7efdd 100644 --- a/app/controllers/documentation/DocumentationController.scala +++ b/app/controllers/documentation/DocumentationController.scala @@ -7,8 +7,8 @@ import org.apache.pekko.actor.typed.ActorSystem import org.apache.pekko.actor.typed.scaladsl.AskPattern._ import org.apache.pekko.actor.typed.scaladsl.adapter._ import org.apache.pekko.util.Timeout -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import models.PlayReleases import models.documentation.AlternateTranslation import models.documentation.DocumentationRedirects diff --git a/app/controllers/documentation/Router.scala b/app/controllers/documentation/Router.scala index 05ffe776..75806219 100644 --- a/app/controllers/documentation/Router.scala +++ b/app/controllers/documentation/Router.scala @@ -1,8 +1,8 @@ package controllers.documentation -import javax.inject.Inject +import jakarta.inject.Inject import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Singleton import play.api.i18n.Lang import play.api.routing.sird._ import play.utils.UriEncoding diff --git a/app/models/PlayExampleProjects.scala b/app/models/PlayExampleProjects.scala index c6f56503..77433921 100644 --- a/app/models/PlayExampleProjects.scala +++ b/app/models/PlayExampleProjects.scala @@ -4,7 +4,7 @@ import com.google.inject.AbstractModule import com.google.inject.Singleton import org.apache.commons.io.IOUtils -import javax.inject.Inject +import jakarta.inject.Inject import play.api.Configuration import play.api.Environment import play.api.cache.SyncCacheApi diff --git a/app/services/github/ContributorsSummariser.scala b/app/services/github/ContributorsSummariser.scala index 4f1ec2e2..d962390b 100644 --- a/app/services/github/ContributorsSummariser.scala +++ b/app/services/github/ContributorsSummariser.scala @@ -1,7 +1,7 @@ package services.github -import javax.inject.Singleton -import javax.inject.Inject +import jakarta.inject.Singleton +import jakarta.inject.Inject import org.apache.pekko.actor.ActorSystem import com.google.inject.name.Named diff --git a/app/services/github/GitHub.scala b/app/services/github/GitHub.scala index bd8721e6..56b719ce 100644 --- a/app/services/github/GitHub.scala +++ b/app/services/github/GitHub.scala @@ -1,6 +1,6 @@ package services.github -import javax.inject.Inject +import jakarta.inject.Inject import com.damnhandy.uri.template.UriTemplate import play.api.http.HeaderNames diff --git a/app/services/modules/ModuleDao.scala b/app/services/modules/ModuleDao.scala index b5cecf01..a60a40b8 100644 --- a/app/services/modules/ModuleDao.scala +++ b/app/services/modules/ModuleDao.scala @@ -1,7 +1,7 @@ package services.modules -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import com.google.inject.ImplementedBy import models.modules._ diff --git a/app/services/modules/ModulesLookup.scala b/app/services/modules/ModulesLookup.scala index 1f4518d8..a66385f6 100644 --- a/app/services/modules/ModulesLookup.scala +++ b/app/services/modules/ModulesLookup.scala @@ -2,7 +2,7 @@ package services.modules import java.io.File import java.util.zip.ZipFile -import javax.inject.Inject +import jakarta.inject.Inject import com.google.inject.ImplementedBy import play.api.Environment diff --git a/app/services/opencollective/MembersSummariser.scala b/app/services/opencollective/MembersSummariser.scala index 5ffabd8c..d7c8282d 100644 --- a/app/services/opencollective/MembersSummariser.scala +++ b/app/services/opencollective/MembersSummariser.scala @@ -1,7 +1,7 @@ package services.opencollective -import javax.inject.Singleton -import javax.inject.Inject +import jakarta.inject.Singleton +import jakarta.inject.Inject import org.apache.pekko.actor.ActorSystem import com.google.inject.name.Named import models.opencollective.FallbackMembers diff --git a/app/services/opencollective/OpenCollective.scala b/app/services/opencollective/OpenCollective.scala index b949aae5..abbc4008 100644 --- a/app/services/opencollective/OpenCollective.scala +++ b/app/services/opencollective/OpenCollective.scala @@ -5,7 +5,7 @@ import play.api.libs.json.Reads import play.api.libs.ws.WSClient import play.api.libs.ws.WSResponse -import javax.inject.Inject +import jakarta.inject.Inject import scala.concurrent.ExecutionContext import scala.concurrent.Future diff --git a/app/services/releases/ReleasesModule.scala b/app/services/releases/ReleasesModule.scala index 47591869..8b511494 100644 --- a/app/services/releases/ReleasesModule.scala +++ b/app/services/releases/ReleasesModule.scala @@ -1,8 +1,8 @@ package services.releases import javax.inject.Provider -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import com.google.inject.AbstractModule import models.PlayRelease