Skip to content

Commit 9b38f0f

Browse files
renovate[bot]mpkorstanje
renovate[bot]
and
mpkorstanje
authored
Update dependency com.google.inject:guice to v7 (#2752)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: M.P. Korstanje <[email protected]>
1 parent fae449b commit 9b38f0f

File tree

6 files changed

+96
-12
lines changed

6 files changed

+96
-12
lines changed

‎.revapi/api-changes.json

+88
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,94 @@
376376
"old": "field com\\.google\\.inject\\.internal\\.ErrorId\\..*",
377377
"new": "field com\\.google\\.inject\\.internal\\.ErrorId\\..*",
378378
"justification": "It's Google."
379+
},
380+
381+
{
382+
"ignore": true,
383+
"code": "java.class.noLongerImplementsInterface",
384+
"old": "interface com.google.inject.Provider<T>",
385+
"new": "interface com.google.inject.Provider<T>",
386+
"interface": "javax.inject.Provider<T>",
387+
"justification": "Guice v7 uses Jakarta"
388+
},
389+
{
390+
"ignore": true,
391+
"code": "java.class.nowImplementsInterface",
392+
"old": "interface com.google.inject.Provider<T>",
393+
"new": "interface com.google.inject.Provider<T>",
394+
"interface": "jakarta.inject.Provider<T>",
395+
"justification": "Guice v7 uses Jakarta"
396+
},
397+
{
398+
"ignore": true,
399+
"code": "java.method.parameterTypeParameterChanged",
400+
"old": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===com.google.inject.Key<? extends javax.inject.Provider<? extends T>>===)",
401+
"new": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===com.google.inject.Key<? extends jakarta.inject.Provider<? extends T>>===)",
402+
"parameterIndex": "0",
403+
"justification": "Guice v7 uses Jakarta"
404+
},
405+
{
406+
"ignore": true,
407+
"code": "java.method.parameterTypeParameterChanged",
408+
"old": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===com.google.inject.TypeLiteral<? extends javax.inject.Provider<? extends T>>===)",
409+
"new": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===com.google.inject.TypeLiteral<? extends jakarta.inject.Provider<? extends T>>===)",
410+
"parameterIndex": "0",
411+
"justification": "Guice v7 uses Jakarta"
412+
413+
},
414+
{
415+
"ignore": true,
416+
"code": "java.method.parameterTypeParameterChanged",
417+
"old": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===java.lang.Class<? extends javax.inject.Provider<? extends T>>===)",
418+
"new": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===java.lang.Class<? extends jakarta.inject.Provider<? extends T>>===)",
419+
"parameterIndex": "0",
420+
"justification": "Guice v7 uses Jakarta"
421+
},
422+
{
423+
"ignore": true,
424+
"code": "java.method.parameterTypeChanged",
425+
"old": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===javax.inject.Provider<? extends T>===)",
426+
"new": "parameter com.google.inject.binder.ScopedBindingBuilder com.google.inject.binder.LinkedBindingBuilder<T>::toProvider(===jakarta.inject.Provider<? extends T>===)",
427+
"parameterIndex": "0",
428+
"justification": "Guice v7 uses Jakarta"
429+
},
430+
{
431+
"ignore": true,
432+
"code": "java.field.addedStaticField",
433+
"new": "field com.google.inject.internal.ErrorId.REQUEST_INJECTION_WITH_DIFFERENT_TYPES",
434+
"justification": "Guice v7 uses Jakarta"
435+
},
436+
{
437+
"ignore": true,
438+
"code": "java.method.returnTypeChanged",
439+
"old": "method javax.inject.Provider<? extends T> com.google.inject.spi.ProviderInstanceBinding<T>::getUserSuppliedProvider()",
440+
"new": "method jakarta.inject.Provider<? extends T> com.google.inject.spi.ProviderInstanceBinding<T>::getUserSuppliedProvider()",
441+
"justification": "Guice v7 uses Jakarta"
442+
},
443+
{
444+
"ignore": true,
445+
"code": "java.method.returnTypeTypeParametersChanged",
446+
"old": "method com.google.inject.Key<? extends javax.inject.Provider<? extends T>> com.google.inject.spi.ProviderKeyBinding<T>::getProviderKey()",
447+
"new": "method com.google.inject.Key<? extends jakarta.inject.Provider<? extends T>> com.google.inject.spi.ProviderKeyBinding<T>::getProviderKey()",
448+
"justification": "Guice v7 uses Jakarta"
449+
},
450+
{
451+
"ignore": true,
452+
"code": "java.method.added",
453+
"new": "method <T> void com.google.inject.AbstractModule::requestInjection(com.google.inject.TypeLiteral<T>, T) @ io.cucumber.guice.ScenarioModule",
454+
"justification": "Guice v7 uses Jakarta"
455+
},
456+
{
457+
"ignore": true,
458+
"code": "java.class.externalClassExposedInAPI",
459+
"new": "interface jakarta.inject.Provider<T>",
460+
"justification": "Guice v7 uses Jakarta"
461+
},
462+
{
463+
"ignore": true,
464+
"code": "java.class.externalClassNoLongerExposedInAPI",
465+
"old": "interface javax.inject.Provider<T>",
466+
"justification": "Guice v7 uses Jakarta"
379467
}
380468
]
381469
}

‎cucumber-guice/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<properties>
1515
<apiguardian-api.version>1.1.2</apiguardian-api.version>
16-
<guice.version>5.1.0</guice.version>
16+
<guice.version>7.0.0</guice.version>
1717
<hamcrest.version>2.2</hamcrest.version>
1818
<junit-jupiter.version>5.9.3</junit-jupiter.version>
1919
<project.Automatic-Module-Name>io.cucumber.guice</project.Automatic-Module-Name>

‎cucumber-guice/src/test/java/io/cucumber/guice/GuiceFactoryTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
import io.cucumber.guice.integration.YourInjectorSource;
1515
import io.cucumber.guice.matcher.ElementsAreAllEqualMatcher;
1616
import io.cucumber.guice.matcher.ElementsAreAllUniqueMatcher;
17+
import jakarta.inject.Singleton;
1718
import org.junit.jupiter.api.AfterEach;
1819
import org.junit.jupiter.api.Test;
1920
import org.junit.jupiter.api.function.Executable;
2021

21-
import javax.inject.Singleton;
22-
2322
import java.util.Arrays;
2423
import java.util.List;
2524

‎cucumber-guice/src/test/java/io/cucumber/guice/integration/ScenarioScopedSteps.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import io.cucumber.java.en.Given;
55
import io.cucumber.java.en.Then;
66
import io.cucumber.java.en.When;
7-
8-
import javax.inject.Inject;
9-
import javax.inject.Provider;
7+
import jakarta.inject.Inject;
8+
import jakarta.inject.Provider;
109

1110
import java.util.ArrayList;
1211
import java.util.List;

‎cucumber-guice/src/test/java/io/cucumber/guice/integration/SingletonScopedSteps.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import io.cucumber.java.en.Given;
55
import io.cucumber.java.en.Then;
66
import io.cucumber.java.en.When;
7-
8-
import javax.inject.Inject;
9-
import javax.inject.Provider;
7+
import jakarta.inject.Inject;
8+
import jakarta.inject.Provider;
109

1110
import java.util.ArrayList;
1211
import java.util.List;

‎cucumber-guice/src/test/java/io/cucumber/guice/integration/UnScopedSteps.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import io.cucumber.java.en.Given;
44
import io.cucumber.java.en.Then;
55
import io.cucumber.java.en.When;
6-
7-
import javax.inject.Inject;
8-
import javax.inject.Provider;
6+
import jakarta.inject.Inject;
7+
import jakarta.inject.Provider;
98

109
import java.util.ArrayList;
1110
import java.util.List;

0 commit comments

Comments
 (0)