major(deps): Upgrade to Guice v7 (#239)

pleo-io · Feb 2, 2024 · 30552c5 · 30552c5
1 parent a105b8c
commit 30552c5
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 36 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,10 +3,10 @@ commonsBeanUtilsVersion = "1.9.4"
 commonsConfiguration2Version = "2.8.0"
 googleGuavaVersion = "31.1-jre"
 googleTruthVersion = "1.1.3"
-guiceVersion = "5.1.0"
+guiceVersion = "7.0.0"
 jacksonVersion = "2.14.2"
 junitVersion = "5.9.3"
-kotlinGuiceVersion = "1.6.0"
+kotlinGuiceVersion = "3.0.0"
 kotlinVersion = "1.8.0"
 kotlinterGradleVersion = "3.16.0"
 logbackClassicVersion = "1.4.5"

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/BothNamedAnnotations.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/BothNamedAnnotations.kt
@@ -1,13 +1,13 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
 import com.google.inject.name.Named as GoogleNamed
-import javax.inject.Named as JavaxNamed
+import jakarta.inject.Named as JakartaNamed
 
 class BothNamedAnnotations
 @Inject
 constructor(
-    @JavaxNamed("io.pleo.test.prop3") val stringProp1: Prop<String>,
+    @JakartaNamed("io.pleo.test.prop3") val stringProp1: Prop<String>,
     @GoogleNamed("io.pleo.test.prop4") val stringProp2: Prop<String>,
 )
diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/ComplexObjects.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/ComplexObjects.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 @Suppress("unused")
 class ComplexObjects

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/CurrencyUnitProp.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/CurrencyUnitProp.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 import javax.money.CurrencyUnit
 
 class CurrencyUnitProp

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/DefaultValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/DefaultValue.kt
@@ -1,9 +1,9 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Default
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 class DefaultValue
 @Inject

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/EmptyNamedAnnotation.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/EmptyNamedAnnotation.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
+import jakarta.inject.Named
 
 @Suppress("UNUSED_PARAMETER")
 class EmptyNamedAnnotation

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InlineProviderModule.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InlineProviderModule.kt
@@ -4,8 +4,8 @@ package io.pleo.prop.objects
 import com.google.inject.AbstractModule
 import com.google.inject.Provides
 import com.google.inject.Singleton
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Named
 
 @Suppress("unused", "SpellCheckingInspection", "unused_parameter")
 class InlineProviderModule : AbstractModule() {

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValue.kt
@@ -1,9 +1,9 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Default
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 @Suppress("unused")
 class InvalidDefaultValue

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValueButValidValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValueButValidValue.kt
@@ -1,9 +1,9 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Default
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 @Suppress("unused")
 class InvalidDefaultValueButValidValue

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidJSON.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidJSON.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 @Suppress("UNUSED_PARAMETER")
 class InvalidJSON

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp.kt
@@ -2,8 +2,8 @@ package io.pleo.prop.objects
 
 import com.google.inject.Inject
 import com.google.inject.assistedinject.Assisted
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Named
 
 @Suppress("unused")
 class MyAssistedInjectFactoryImp

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp2.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp2.kt
@@ -2,8 +2,8 @@ package io.pleo.prop.objects
 
 import com.google.inject.Inject
 import com.google.inject.assistedinject.Assisted
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Named
 
 @Suppress("unused")
 class MyAssistedInjectFactoryImp2

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/MyInterfaceProvider.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/MyInterfaceProvider.kt
@@ -1,9 +1,9 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
-import javax.inject.Provider
+import jakarta.inject.Provider
 
 class MyInterfaceProvider
 @Inject

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/NoPropObject.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/NoPropObject.kt
@@ -1,6 +1,6 @@
 package io.pleo.prop.objects
 
-import javax.inject.Inject
+import com.google.inject.Inject
 import javax.sql.DataSource
 
 class NoPropObject

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/NullValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/NullValue.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 @Suppress("unused", "UNUSED_PARAMETER")
 class NullValue

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/SamePropertyAsComplexObjects.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/SamePropertyAsComplexObjects.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 class SamePropertyAsComplexObjects
 @Inject

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/UnnamedProp.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/UnnamedProp.kt
@@ -1,7 +1,7 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
 
 @Suppress("unused", "UNUSED_PARAMETER")
 class UnnamedProp

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/UsesTwiceSameProp.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/UsesTwiceSameProp.kt
@@ -1,8 +1,8 @@
 package io.pleo.prop.objects
 
+import com.google.inject.Inject
+import com.google.inject.name.Named
 import io.pleo.prop.core.Prop
-import javax.inject.Inject
-import javax.inject.Named
 
 class UsesTwiceSameProp
 @Inject

diff --git a/prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropMappingVisitor.kt b/prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropMappingVisitor.kt
@@ -20,7 +20,8 @@ import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import java.util.Optional.ofNullable
 import java.util.function.Predicate
-import javax.inject.Named
+import com.google.inject.name.Named as GoogleNamed
+import jakarta.inject.Named as JakartaNamed
 
 typealias PropResult = Result<Prop<*>>
 
@@ -134,8 +135,8 @@ class PropMappingVisitor(
 
     private fun annotationValueIfNamed(annotation: Annotation): String? =
         when (annotation) {
-            is Named -> annotation.value
-            is com.google.inject.name.Named -> annotation.value
+            is JakartaNamed -> annotation.value
+            is GoogleNamed -> annotation.value
             else -> null
         }?.ifEmpty { null }
 }