Skip to content
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

major(deps): Upgrade to Guice v7 #239

Merged
merged 7 commits into from
Feb 2, 2024
Merged

major(deps): Upgrade to Guice v7 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a21a729
Upgrade to Guice v7
erwinw Jan 27, 2024
a5c16f8
Remove centralised-templates github actions
erwinw Jan 29, 2024
93f80c0
Do not push test release version
erwinw Jan 29, 2024
c9ed2e8
Revert "Remove centralised-templates github actions"
erwinw Jan 30, 2024
60e4783
Merge branch 'main' into chore/bump-juice-v7
erwinw Jan 30, 2024
35c02b5
Merge branch 'main' into chore/bump-juice-v7
erwinw Jan 31, 2024
96f0d24
PR feedback: consistency fix
erwinw Feb 2, 2024
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/BothNamedAnnotations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>,
)
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/ComplexObjects.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
andriygg marked this conversation as resolved.
Show resolved Hide resolved
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

@Suppress("unused")
class ComplexObjects
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/CurrencyUnitProp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/DefaultValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/EmptyNamedAnnotation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion prop-all/src/test/kotlin/io/pleo/prop/objects/InlineProviderModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValueButValidValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidJSON.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/MyInterfaceProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion prop-all/src/test/kotlin/io/pleo/prop/objects/NoPropObject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.pleo.prop.objects

import javax.inject.Inject
import com.google.inject.Inject
import javax.sql.DataSource

class NoPropObject
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/NullValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/SamePropertyAsComplexObjects.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion prop-all/src/test/kotlin/io/pleo/prop/objects/UnnamedProp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/UsesTwiceSameProp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropMappingVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<*>>

Expand Down Expand Up @@ -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 }
}
Loading