Skip to content

use jakarta.inject instead of javax.inject #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkurz merged 1 commit into from
Jul 5, 2025
Merged

use jakarta.inject instead of javax.inject #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/actors/Actors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/Application.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/Blog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/Code.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package controllers

import javax.inject.Inject
import jakarta.inject.Inject

import play.api.mvc.AbstractController
import play.api.mvc.ControllerComponents
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/Modules.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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._
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/Outreachy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package controllers

import javax.inject.Inject
import jakarta.inject.Inject

import play.api.mvc.AbstractController
import play.api.mvc.ControllerComponents
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/Security.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/documentation/DocumentationController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/documentation/Router.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/models/PlayExampleProjects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/services/github/ContributorsSummariser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/services/github/GitHub.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/services/modules/ModuleDao.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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._
Expand Down
2 changes: 1 addition & 1 deletion app/services/modules/ModulesLookup.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/services/opencollective/MembersSummariser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/services/opencollective/OpenCollective.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions app/services/releases/ReleasesModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading