Prepare for release v7.0.0

tsuckow · tsuckow · commit 0e1b647e41f3 · 2023-05-13T18:32:35.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+7.0.0
+-----
+2023-05-13
+
+* Update to Guice 7.0.0
+  - Note: Drops support for javax.*
+
 6.0.0
 -----
 2023-05-13
diff --git a/README.md b/README.md
@@ -14,18 +14,18 @@ We currently support Scala `2.11`, `2.12`, `2.13`, and `3`
 <dependency>
     <groupId>net.codingwell</groupId>
     <artifactId>scala-guice_2.13</artifactId>
-    <version>5.1.1</version>
+    <version>7.0.0</version>
 </dependency>
 ```
 
 ##### sbt:
 ```scala
-"net.codingwell" %% "scala-guice" % "5.1.1"
+"net.codingwell" %% "scala-guice" % "7.0.0"
 ```
 
 ##### gradle:
 ```groovy
-'net.codingwell:scala-guice_2.13:5.1.1'
+'net.codingwell:scala-guice_2.13:7.0.0'
 ```
 
 ### Mixin
@@ -210,14 +210,14 @@ class MyModule extends AbstractModule with ScalaModule {
 }
 ```
 
-And then they may be retrieved as `Option[T]`, `Option[Provider[T]]`, and `Option[javax.inject.Provider[T]]`. (examples in order)
+And then they may be retrieved as `Option[T]`, `Option[Provider[T]]`, and `Option[jakarta.inject.Provider[T]]`. (examples in order)
 
 ```scala
 class StringThing @Inject() (name: Option[String]) { ... }
 
 class AThing @Inject() (@Annotation aProvider: Option[Provider[T]]) { ... }
 
-class Service @Inject() (@Names.named("backend") configProvider: Option[javax.inject.Provider[ServiceConfiguration]]) { ... }
+class Service @Inject() (@Names.named("backend") configProvider: Option[jakarta.inject.Provider[ServiceConfiguration]]) { ... }
 ```
 
 ### MapBinding
@@ -236,7 +236,7 @@ class MyModule extends AbstractModule with ScalaModule {
 And then may be retrieved as any of the following:
 - `immutable.Map[K, V]`
 - `immutable.Map[K, Provider[V]]`
-- `immutable.Map[K, javax.inject.Provider[V]]`
+- `immutable.Map[K, jakarta.inject.Provider[V]]`
 
 If you call `mapBinder.permitDuplicates()` on the binder then you may also inject:
 - `immutable.Map[K, immutable.Set[V]]`
diff --git a/build.sbt b/build.sbt
@@ -4,15 +4,15 @@ description := "Scala syntax for Guice"
 
 organization := "net.codingwell"
 
-version := "6.0.0"
+version := "7.0.0"
 versionScheme := Some("pvp")
 
 licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
 homepage := Some(url("https://github.com/codingwell/scala-guice"))
 
 libraryDependencies ++= Seq(
-  "com.google.inject" % "guice" % "6.0.0",
+  "com.google.inject" % "guice" % "7.0.0",
   "org.scalatest" %% "scalatest" % "3.2.9" % "test",
   "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile"
 )
diff --git a/src/main/scala-2/net/codingwell/scalaguice/BindingExtensions.scala b/src/main/scala-2/net/codingwell/scalaguice/BindingExtensions.scala
@@ -19,7 +19,7 @@ import com.google.inject.Binder
 import com.google.inject.binder._
 import com.google.inject.name.Names
 import java.lang.annotation.{Annotation => JAnnotation}
-import javax.inject.Provider
+import jakarta.inject.Provider
 import scala.reflect.ClassTag
 import scala.reflect.runtime.universe.TypeTag
 
diff --git a/src/main/scala-2/net/codingwell/scalaguice/ScalaMapBinder.scala b/src/main/scala-2/net/codingwell/scalaguice/ScalaMapBinder.scala
@@ -201,7 +201,7 @@ object ScalaMapBinder {
     def configure(binder: Binder): Unit = {
       bindMapping(binder, vTyp)
       bindMapping(binder, wrap[Provider].around(vTyp))
-      bindMapping(binder, wrap[javax.inject.Provider].around(vTyp))
+      bindMapping(binder, wrap[jakarta.inject.Provider].around(vTyp))
     }
 
     private[this] def bindMapping[T](binder: Binder, typ: TypeLiteral[T]): Unit = {
diff --git a/src/main/scala-2/net/codingwell/scalaguice/ScalaModule.scala b/src/main/scala-2/net/codingwell/scalaguice/ScalaModule.scala
@@ -27,7 +27,7 @@ import com.google.inject.{
 }
 import java.lang.annotation.Annotation
 import java.lang.reflect.AnnotatedElement
-import javax.inject.Provider
+import jakarta.inject.Provider
 import org.aopalliance.intercept.MethodInterceptor
 import scala.reflect.ClassTag
 import scala.reflect.runtime.universe._
diff --git a/src/main/scala-2/net/codingwell/scalaguice/ScalaOptionBinder.scala b/src/main/scala-2/net/codingwell/scalaguice/ScalaOptionBinder.scala
@@ -157,7 +157,7 @@ object ScalaOptionBinder {
     def configure(binder: Binder): Unit = {
       bindMapping(binder, key.getTypeLiteral)
       bindMapping(binder, wrap[Provider].around(key.getTypeLiteral))
-      bindMapping(binder, wrap[javax.inject.Provider].around(key.getTypeLiteral))
+      bindMapping(binder, wrap[jakarta.inject.Provider].around(key.getTypeLiteral))
     }
 
     private[this] def bindMapping[S](binder: Binder, typ: TypeLiteral[S]): Unit = {
diff --git a/src/main/scala-3/net/codingwell/scalaguice/BindingExtensions.scala b/src/main/scala-3/net/codingwell/scalaguice/BindingExtensions.scala
@@ -19,7 +19,7 @@ import com.google.inject.Binder
 import com.google.inject.binder._
 import com.google.inject.name.Names
 import java.lang.annotation.{Annotation => JAnnotation}
-import javax.inject.Provider
+import jakarta.inject.Provider
 import scala.reflect.ClassTag
 
 /**
diff --git a/src/main/scala-3/net/codingwell/scalaguice/ScalaMapBinder.scala b/src/main/scala-3/net/codingwell/scalaguice/ScalaMapBinder.scala
@@ -200,7 +200,7 @@ object ScalaMapBinder {
     def configure(binder: Binder): Unit = {
       bindMapping(binder, vTyp)
       bindMapping(binder, wrap[Provider].around(vTyp))
-      bindMapping(binder, wrap[javax.inject.Provider].around(vTyp))
+      bindMapping(binder, wrap[jakarta.inject.Provider].around(vTyp))
     }
 
     private[this] def bindMapping[T](binder: Binder, typ: TypeLiteral[T]): Unit = {
diff --git a/src/main/scala-3/net/codingwell/scalaguice/ScalaModule.scala b/src/main/scala-3/net/codingwell/scalaguice/ScalaModule.scala
@@ -28,7 +28,7 @@ import com.google.inject.{
 }
 import java.lang.annotation.Annotation
 import java.lang.reflect.{AnnotatedElement, Method}
-import javax.inject.Provider
+import jakarta.inject.Provider
 import org.aopalliance.intercept.MethodInterceptor
 import scala.reflect.ClassTag
 
diff --git a/src/main/scala-3/net/codingwell/scalaguice/ScalaOptionBinder.scala b/src/main/scala-3/net/codingwell/scalaguice/ScalaOptionBinder.scala
@@ -156,7 +156,7 @@ object ScalaOptionBinder {
     def configure(binder: Binder): Unit = {
       bindMapping(binder, key.getTypeLiteral)
       bindMapping(binder, wrap[Provider].around(key.getTypeLiteral))
-      bindMapping(binder, wrap[javax.inject.Provider].around(key.getTypeLiteral))
+      bindMapping(binder, wrap[jakarta.inject.Provider].around(key.getTypeLiteral))
     }
 
     private[this] def bindMapping[S](binder: Binder, typ: TypeLiteral[S]): Unit = {
diff --git a/src/main/scala/net/codingwell/scalaguice/binder/BindingProxies.scala b/src/main/scala/net/codingwell/scalaguice/binder/BindingProxies.scala
@@ -58,10 +58,10 @@ trait LinkedBindingBuilderProxy[T] extends LinkedBindingBuilder[T] with ScopedBi
   override def toConstructor[S <: T](constructor:JConstructor[S]) = newBuilder(self.toConstructor(constructor))
   override def toConstructor[S <: T](constructor:JConstructor[S], literal:TypeLiteral[_ <: S]) = newBuilder(self.toConstructor(constructor,literal))
   override def toProvider(provider: Provider[_ <: T]) = newBuilder(self.toProvider(provider))
-  override def toProvider(provider: javax.inject.Provider[_ <: T]) = newBuilder(self.toProvider(provider))
-  def toProvider(provider: Class[_ <: javax.inject.Provider[_ <: T]]) = newBuilder(self.toProvider(provider))
-  def toProvider(provider: TypeLiteral[_ <: javax.inject.Provider[_ <: T]]) = newBuilder(self.toProvider(provider))
-  def toProvider(providerKey: Key[_ <: javax.inject.Provider[_ <: T]]) = newBuilder(self.toProvider(providerKey))
+  override def toProvider(provider: jakarta.inject.Provider[_ <: T]) = newBuilder(self.toProvider(provider))
+  def toProvider(provider: Class[_ <: jakarta.inject.Provider[_ <: T]]) = newBuilder(self.toProvider(provider))
+  def toProvider(provider: TypeLiteral[_ <: jakarta.inject.Provider[_ <: T]]) = newBuilder(self.toProvider(provider))
+  def toProvider(providerKey: Key[_ <: jakarta.inject.Provider[_ <: T]]) = newBuilder(self.toProvider(providerKey))
 
   private[this] def newBuilder(underlying: ScopedBindingBuilder) = new ScalaScopedBindingBuilder {
     val self = underlying
diff --git a/src/test/scala-2/net/codingwell/scalaguice/ScalaMapBinderSpec.scala b/src/test/scala-2/net/codingwell/scalaguice/ScalaMapBinderSpec.scala
@@ -369,23 +369,23 @@ class ScalaMapBinderSpec extends AnyWordSpec with Matchers {
 
     validate(injector.instance[im.Map[K, V]], expected: _*)
     validate(injector.instance[im.Map[K, Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, jakarta.inject.Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private def validateWithAnnotation[K: TypeTag, V: TypeTag](module: Module, annotation: Annotation, expected: (K, V)*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V]](annotation), expected: _*)
     validate(injector.instance[im.Map[K, Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, jakarta.inject.Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private def validateWithAnn[K: TypeTag, V: TypeTag, Ann <: Annotation : ClassTag](module: Module, expected: (K, V)*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V], Ann], expected: _*)
     validate(injector.instance[im.Map[K, Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, jakarta.inject.Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private def validateMultiMap[K: TypeTag, V: TypeTag](module: Module, expected: (K, im.Set[V])*): Unit = {
diff --git a/src/test/scala-2/net/codingwell/scalaguice/ScalaOptionBinderSpec.scala b/src/test/scala-2/net/codingwell/scalaguice/ScalaOptionBinderSpec.scala
@@ -343,12 +343,12 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T]] should contain(expected)
     injector.instance[Option[Provider[T]]].get.get() should equal(expected)
-    injector.instance[Option[javax.inject.Provider[T]]].get.get() should equal(expected)
+    injector.instance[Option[jakarta.inject.Provider[T]]].get.get() should equal(expected)
 
     // Check Optional
     injector.instance[Optional[T]].get should equal(expected)
     injector.instance[Optional[Provider[T]]].get.get() should equal(expected)
-    injector.instance[Optional[javax.inject.Provider[T]]].get.get() should equal(expected)
+    injector.instance[Optional[jakarta.inject.Provider[T]]].get.get() should equal(expected)
   }
 
   private def validateWithAnn[T: TypeTag, Ann <: Annotation : ClassTag](module: Module, expected: T = "A"): Unit = {
@@ -357,12 +357,12 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T], Ann] should contain(expected)
     injector.instance[Option[Provider[T]], Ann].get.get() should equal(expected)
-    injector.instance[Option[javax.inject.Provider[T]], Ann].get.get() should equal(expected)
+    injector.instance[Option[jakarta.inject.Provider[T]], Ann].get.get() should equal(expected)
 
     // Check Optional
     injector.instance[Optional[T], Ann].get should equal(expected)
     injector.instance[Optional[Provider[T]], Ann].get.get() should equal(expected)
-    injector.instance[Optional[javax.inject.Provider[T]], Ann].get.get() should equal(expected)
+    injector.instance[Optional[jakarta.inject.Provider[T]], Ann].get.get() should equal(expected)
   }
 
   private def validateWithAnnotation[T: TypeTag](module: Module, annotation: Annotation, expected: T): Unit = {
@@ -371,12 +371,12 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T]](annotation) should contain(expected)
     injector.instance[Option[Provider[T]]](annotation).get.get() should equal(expected)
-    injector.instance[Option[javax.inject.Provider[T]]](annotation).get.get() should equal(expected)
+    injector.instance[Option[jakarta.inject.Provider[T]]](annotation).get.get() should equal(expected)
 
     // Check Optional
     injector.instance[Optional[T]](annotation).get should equal(expected)
     injector.instance[Optional[Provider[T]]](annotation).get.get() should equal(expected)
-    injector.instance[Optional[javax.inject.Provider[T]]](annotation).get.get() should equal(expected)
+    injector.instance[Optional[jakarta.inject.Provider[T]]](annotation).get.get() should equal(expected)
   }
 
   private def validateAbsent[T: TypeTag](module: Module, expected: T = "A"): Unit = {
@@ -385,11 +385,11 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T]] should be (None)
     injector.instance[Option[Provider[T]]] should be (None)
-    injector.instance[Option[javax.inject.Provider[T]]] should be (None)
+    injector.instance[Option[jakarta.inject.Provider[T]]] should be (None)
 
     // Check Optional
     injector.instance[Optional[T]].isPresent should be (false)
     injector.instance[Optional[Provider[T]]].isPresent should be (false)
-    injector.instance[Optional[javax.inject.Provider[T]]].isPresent should be (false)
+    injector.instance[Optional[jakarta.inject.Provider[T]]].isPresent should be (false)
   }
 }
diff --git a/src/test/scala-3/net/codingwell/scalaguice/ScalaMapBinderSpec.scala b/src/test/scala-3/net/codingwell/scalaguice/ScalaMapBinderSpec.scala
@@ -368,23 +368,23 @@ class ScalaMapBinderSpec extends AnyWordSpec with Matchers {
 
     validate(injector.instance[im.Map[K, V]], expected: _*)
     validate(injector.instance[im.Map[K, Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, jakarta.inject.Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private inline def validateWithAnnotation[K, V](module: Module, annotation: Annotation, expected: (K, V)*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V]](annotation), expected: _*)
     validate(injector.instance[im.Map[K, Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, jakarta.inject.Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private inline def validateWithAnn[K, V, Ann <: Annotation : ClassTag](module: Module, expected: (K, V)*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V], Ann], expected: _*)
     validate(injector.instance[im.Map[K, Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, jakarta.inject.Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private inline def validateMultiMap[K, V](module: Module, expected: (K, im.Set[V])*): Unit = {
diff --git a/src/test/scala-3/net/codingwell/scalaguice/ScalaOptionBinderSpec.scala b/src/test/scala-3/net/codingwell/scalaguice/ScalaOptionBinderSpec.scala
@@ -342,12 +342,12 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T]] should contain(expected)
     injector.instance[Option[Provider[T]]].get.get() should equal(expected)
-    injector.instance[Option[javax.inject.Provider[T]]].get.get() should equal(expected)
+    injector.instance[Option[jakarta.inject.Provider[T]]].get.get() should equal(expected)
 
     // Check Optional
     injector.instance[Optional[T]].get should equal(expected)
     injector.instance[Optional[Provider[T]]].get.get() should equal(expected)
-    injector.instance[Optional[javax.inject.Provider[T]]].get.get() should equal(expected)
+    injector.instance[Optional[jakarta.inject.Provider[T]]].get.get() should equal(expected)
   }
 
   private inline def validateWithAnn[T, Ann <: Annotation : ClassTag](module: Module, expected: T = "A"): Unit = {
@@ -356,12 +356,12 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T], Ann] should contain(expected)
     injector.instance[Option[Provider[T]], Ann].get.get() should equal(expected)
-    injector.instance[Option[javax.inject.Provider[T]], Ann].get.get() should equal(expected)
+    injector.instance[Option[jakarta.inject.Provider[T]], Ann].get.get() should equal(expected)
 
     // Check Optional
     injector.instance[Optional[T], Ann].get should equal(expected)
     injector.instance[Optional[Provider[T]], Ann].get.get() should equal(expected)
-    injector.instance[Optional[javax.inject.Provider[T]], Ann].get.get() should equal(expected)
+    injector.instance[Optional[jakarta.inject.Provider[T]], Ann].get.get() should equal(expected)
   }
 
   private inline def validateWithAnnotation[T](module: Module, annotation: Annotation, expected: T): Unit = {
@@ -370,12 +370,12 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T]](annotation) should contain(expected)
     injector.instance[Option[Provider[T]]](annotation).get.get() should equal(expected)
-    injector.instance[Option[javax.inject.Provider[T]]](annotation).get.get() should equal(expected)
+    injector.instance[Option[jakarta.inject.Provider[T]]](annotation).get.get() should equal(expected)
 
     // Check Optional
     injector.instance[Optional[T]](annotation).get should equal(expected)
     injector.instance[Optional[Provider[T]]](annotation).get.get() should equal(expected)
-    injector.instance[Optional[javax.inject.Provider[T]]](annotation).get.get() should equal(expected)
+    injector.instance[Optional[jakarta.inject.Provider[T]]](annotation).get.get() should equal(expected)
   }
 
   private inline def validateAbsent[T](module: Module, expected: T = "A"): Unit = {
@@ -384,11 +384,11 @@ class ScalaOptionBinderSpec extends AnyWordSpec with Matchers {
     // Check Option
     injector.instance[Option[T]] should be (None)
     injector.instance[Option[Provider[T]]] should be (None)
-    injector.instance[Option[javax.inject.Provider[T]]] should be (None)
+    injector.instance[Option[jakarta.inject.Provider[T]]] should be (None)
 
     // Check Optional
     injector.instance[Optional[T]].isPresent should be (false)
     injector.instance[Optional[Provider[T]]].isPresent should be (false)
-    injector.instance[Optional[javax.inject.Provider[T]]].isPresent should be (false)
+    injector.instance[Optional[jakarta.inject.Provider[T]]].isPresent should be (false)
   }
 }
diff --git a/src/test/scala/net/codingwell/scalaguice/ClassesForTesting.scala b/src/test/scala/net/codingwell/scalaguice/ClassesForTesting.scala
@@ -16,7 +16,7 @@
 package net.codingwell.scalaguice
 
 import com.google.inject.TypeLiteral
-import javax.inject.{Provider, Inject, Named}
+import jakarta.inject.{Provider, Inject, Named}
 import org.aopalliance.intercept.MethodInterceptor
 import org.aopalliance.intercept.MethodInvocation
 
@@ -63,7 +63,7 @@ trait Foo {
   def foo(): String
 }
 
-class FooProviderWithJavax extends javax.inject.Provider[Foo] {
+class FooProviderWithJavax extends jakarta.inject.Provider[Foo] {
   def get(): Foo = new Foo {
     def foo() = "foo"
   }
@@ -90,7 +90,7 @@ final case object FinalSealedTrait extends SealedTrait
 
 case class SealedTraitContainer[T <: SealedTrait](inner: T)
 
-class SealedTraitContainerFinalSealedTraitProvider extends javax.inject.Provider[SealedTraitContainer[FinalSealedTrait.type]] {
+class SealedTraitContainerFinalSealedTraitProvider extends jakarta.inject.Provider[SealedTraitContainer[FinalSealedTrait.type]] {
   def get(): SealedTraitContainer[FinalSealedTrait.type] = SealedTraitContainer(FinalSealedTrait)
 }
 
diff --git a/src/test/scala/net/codingwell/scalaguice/ScalaModuleSpec.scala b/src/test/scala/net/codingwell/scalaguice/ScalaModuleSpec.scala
@@ -96,7 +96,7 @@ class ScalaModuleSpec extends AnyWordSpec with Matchers {
       Guice.createInjector(module).getInstance(Key.get(classOf[A],classOf[Named]))
     }
 
-    "allow use provider form javax.inject.Provider" in {
+    "allow use provider form jakarta.inject.Provider" in {
       val module = new AbstractModule with ScalaModule {
         override def configure(): Unit = {
           bind[Foo].toProvider[FooProviderWithJavax]

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ object ScalaMapBinder {`
`201`	`201`	`def configure(binder: Binder): Unit = {`
`202`	`202`	`bindMapping(binder, vTyp)`
`203`	`203`	`bindMapping(binder, wrap[Provider].around(vTyp))`
`204`		`- bindMapping(binder, wrap[javax.inject.Provider].around(vTyp))`
	`204`	`+ bindMapping(binder, wrap[jakarta.inject.Provider].around(vTyp))`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`private[this] def bindMapping[T](binder: Binder, typ: TypeLiteral[T]): Unit = {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import com.google.inject.{`
`27`	`27`	`}`
`28`	`28`	`import java.lang.annotation.Annotation`
`29`	`29`	`import java.lang.reflect.AnnotatedElement`
`30`		`-import javax.inject.Provider`
	`30`	`+import jakarta.inject.Provider`
`31`	`31`	`import org.aopalliance.intercept.MethodInterceptor`
`32`	`32`	`import scala.reflect.ClassTag`
`33`	`33`	`import scala.reflect.runtime.universe._`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ object ScalaOptionBinder {`
`157`	`157`	`def configure(binder: Binder): Unit = {`
`158`	`158`	`bindMapping(binder, key.getTypeLiteral)`
`159`	`159`	`bindMapping(binder, wrap[Provider].around(key.getTypeLiteral))`
`160`		`- bindMapping(binder, wrap[javax.inject.Provider].around(key.getTypeLiteral))`
	`160`	`+ bindMapping(binder, wrap[jakarta.inject.Provider].around(key.getTypeLiteral))`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`private[this] def bindMapping[S](binder: Binder, typ: TypeLiteral[S]): Unit = {`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ object ScalaMapBinder {`
`200`	`200`	`def configure(binder: Binder): Unit = {`
`201`	`201`	`bindMapping(binder, vTyp)`
`202`	`202`	`bindMapping(binder, wrap[Provider].around(vTyp))`
`203`		`- bindMapping(binder, wrap[javax.inject.Provider].around(vTyp))`
	`203`	`+ bindMapping(binder, wrap[jakarta.inject.Provider].around(vTyp))`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`private[this] def bindMapping[T](binder: Binder, typ: TypeLiteral[T]): Unit = {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import com.google.inject.{`
`28`	`28`	`}`
`29`	`29`	`import java.lang.annotation.Annotation`
`30`	`30`	`import java.lang.reflect.{AnnotatedElement, Method}`
`31`		`-import javax.inject.Provider`
	`31`	`+import jakarta.inject.Provider`
`32`	`32`	`import org.aopalliance.intercept.MethodInterceptor`
`33`	`33`	`import scala.reflect.ClassTag`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ object ScalaOptionBinder {`
`156`	`156`	`def configure(binder: Binder): Unit = {`
`157`	`157`	`bindMapping(binder, key.getTypeLiteral)`
`158`	`158`	`bindMapping(binder, wrap[Provider].around(key.getTypeLiteral))`
`159`		`- bindMapping(binder, wrap[javax.inject.Provider].around(key.getTypeLiteral))`
	`159`	`+ bindMapping(binder, wrap[jakarta.inject.Provider].around(key.getTypeLiteral))`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`private[this] def bindMapping[S](binder: Binder, typ: TypeLiteral[S]): Unit = {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`package net.codingwell.scalaguice`
`17`	`17`
`18`	`18`	`import com.google.inject.TypeLiteral`
`19`		`-import javax.inject.{Provider, Inject, Named}`
	`19`	`+import jakarta.inject.{Provider, Inject, Named}`
`20`	`20`	`import org.aopalliance.intercept.MethodInterceptor`
`21`	`21`	`import org.aopalliance.intercept.MethodInvocation`
`22`	`22`
`@@ -63,7 +63,7 @@ trait Foo {`
`63`	`63`	`def foo(): String`
`64`	`64`	`}`
`65`	`65`
`66`		`-class FooProviderWithJavax extends javax.inject.Provider[Foo] {`
	`66`	`+class FooProviderWithJavax extends jakarta.inject.Provider[Foo] {`
`67`	`67`	`def get(): Foo = new Foo {`
`68`	`68`	`def foo() = "foo"`
`69`	`69`	`}`
`@@ -90,7 +90,7 @@ final case object FinalSealedTrait extends SealedTrait`
`90`	`90`
`91`	`91`	`case class SealedTraitContainer[T <: SealedTrait](inner: T)`
`92`	`92`
`93`		`-class SealedTraitContainerFinalSealedTraitProvider extends javax.inject.Provider[SealedTraitContainer[FinalSealedTrait.type]] {`
	`93`	`+class SealedTraitContainerFinalSealedTraitProvider extends jakarta.inject.Provider[SealedTraitContainer[FinalSealedTrait.type]] {`
`94`	`94`	`def get(): SealedTraitContainer[FinalSealedTrait.type] = SealedTraitContainer(FinalSealedTrait)`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class ScalaModuleSpec extends AnyWordSpec with Matchers {`
`96`	`96`	`Guice.createInjector(module).getInstance(Key.get(classOf[A],classOf[Named]))`
`97`	`97`	`}`
`98`	`98`
`99`		`- "allow use provider form javax.inject.Provider" in {`
	`99`	`+ "allow use provider form jakarta.inject.Provider" in {`
`100`	`100`	`val module = new AbstractModule with ScalaModule {`
`101`	`101`	`override def configure(): Unit = {`
`102`	`102`	`bind[Foo].toProvider[FooProviderWithJavax]`