Update minimum support Java version from 8 to 11 #2804

reta · 2022-11-28T16:37:19Z

Signed-off-by: Andriy Redko [email protected]

Fixes #2798

Checklist

Read the contributing guide
PR should be motivated, i.e. what does it fix, why, and if relevant how
If possible / relevant include an example in the description, that could help all readers
including project members to get a better picture of the change
Avoid other runtime dependencies
Meaningful commit history ; intention is important please rebase your commit history so that each
commit is meaningful and help the people that will explore a change in 2 years
The pull request follows coding style
Mention Fixes #<issue number> in the description if relevant
At least one commit should mention Fixes #<issue number> if relevant

build.gradle

gradle.properties

subprojects/errorprone/errorprone.gradle

reta · 2022-11-28T16:55:38Z

@TimvdLippe started the initial work here, thank you

reta · 2022-11-28T17:07:57Z

It seems like I run into mojohaus/animal-sniffer#172 again (but this time using 1.22) :(

TimvdLippe · 2022-11-28T21:41:45Z

Thanks for the PR, this is great! We will need to publish mockito-subclass in Mockito 4 first (#2589 (comment)), so until then we can't merge this PR.

Seems like CI is unhappy about our Javadoc. I couldn't find the failing error, but we have to build our Javadoc with no errors.

reta · 2022-11-28T21:57:27Z

Thanks for the PR, this is great! We will need to publish mockito-subclass in Mockito 4 first (#2589 (comment)), so until then we can't merge this PR.

👍

Seems like CI is unhappy about our Javadoc. I couldn't find the failing error, but we have to build our Javadoc with no errors.

Thanks @TimvdLippe , I will certainly take a look

reta · 2022-11-29T20:58:14Z

@TimvdLippe looks like regression mojohaus/animal-sniffer#172 is back in the new version, I will try to figure that out.

[Undefined reference | android-api-level-24-7.0_r2] org.mockito.internal.creation.bytebuddy.(InlineBytecodeGenerator.java:1)
  >> java.lang.instrument.Instrumentation
> Task :animalsnifferMain FAILED

[Undefined reference | android-api-level-24-7.0_r2] org.mockito.internal.creation.bytebuddy.(InlineDelegateByteBuddyMockMaker.java:1)
  >> java.lang.instrument.Instrumentation

[Undefined reference | android-api-level-24-7.0_r2] org.mockito.internal.creation.proxy.(MethodHandleProxy.java:1)
  >> java.lang.invoke.MethodHandles.Lookup

[Undefined reference | android-api-level-24-7.0_r2] org.mockito.internal.creation.proxy.(MethodHandleProxy.java:1)
  >> java.lang.invoke.MethodHandle

[Undefined reference | android-api-level-24-7.0_r2] org.mockito.internal.util.reflection.(InstrumentationMemberAccessor.java:1)
  >> java.lang.instrument.Instrumentation

[Undefined reference | android-api-level-24-7.0_r2] org.mockito.internal.util.reflection.(InstrumentationMemberAccessor.java:1)
  >> java.lang.invoke.MethodHandles.Lookup

Note: Some input files use or override a deprecated API.

Note: Recompile with -Xlint:deprecation for details.
> Task :errorprone:compileTestJava

reta · 2022-11-30T14:13:20Z

@TimvdLippe looks like regression mojohaus/animal-sniffer#172 is back in the new version, I will try to figure that out.

Huh ... found a workaround here: https://github.com/mockito/mockito/pull/2804/files#diff-49a96e7eea8a94af862798a45174e6ac43eb4f8b4bd40759b5da63ba31ec3ef7R109, not ideal but the only one which works

subprojects/kotlinTest/src/test/kotlin/org/mockito/kotlin/CircularityTest.kt

subprojects/errorprone/errorprone.gradle

reta · 2022-11-30T18:58:49Z

Should be good to go :)

codecov-commenter · 2022-12-01T02:40:27Z

Codecov Report

Base: 84.91% // Head: 84.91% // No change to project coverage 👍

Coverage data is based on head (3863238) compared to base (3863238).
Patch has no changes to coverable lines.

❗ Current head 3863238 differs from pull request most recent head 1ce6b84. Consider uploading reports for the commit 1ce6b84 to get more accurate results

Additional details and impacted files

@@            Coverage Diff            @@
##               main    #2804   +/-   ##
=========================================
  Coverage     84.91%   84.91%           
  Complexity     2812     2812           
=========================================
  Files           320      320           
  Lines          8574     8574           
  Branches       1042     1042           
=========================================
  Hits           7281     7281           
  Misses         1012     1012           
  Partials        281      281

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

TimvdLippe · 2022-12-12T09:26:03Z

src/main/java/org/mockito/internal/debugging/LocationFactory.java

@@ -24,26 +24,13 @@ private interface Factory {
    }

    private static Factory createLocationFactory() {


I know you were initially working on this PR to get these changes in. However, I would like to include these changes in Mockito 5.1.0, so to avoid pulling in too many changes into 1 go. Can you split out these changes into a separate PR so that we can land that? We can then also consider cleaning up some more of these Java 8 utility classes such as JavaEightUtil (

mockito/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java

Line 132 in e2e6289

} else if ("java.util.Optional".equals(type.getName())) {

)

@TimvdLippe sure, I can split that, thanks!

@TimvdLippe I reverted the changes, would you be open to have a plugin for LocationFactory so the alternative implementation could be supplied? (with revert, we are back to reflection <-> SecurityManager issues we've started with). I will open separate issue / pull request, should be a low risk change from implementation perspective, but I am wondering how it is aligned with the project.

TimvdLippe · 2022-12-12T09:27:17Z

All of these changes look good! I would like to land the functional changes in a separate PR and in Mockito 5.1.0 to minimize impact. Other than that, we are mostly blocked on mockito-subclass (#2589 (comment)) before we can merge this PR.

Signed-off-by: Andriy Redko <[email protected]>

TimvdLippe

This is great work, thank you so much!

TimvdLippe · 2022-12-18T19:51:44Z

src/main/java/org/mockito/internal/debugging/LocationImpl.java

+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class LocationImpl implements Location, Serializable {


This should probably have been removed from this PR as well, but I don't see any harm in including an unused class for now. Since I don't want another review cycle, let's merge this now so we can get things going! Thanks 😄

mockito/mockito#2804

reta commented Nov 28, 2022

View reviewed changes

build.gradle Show resolved Hide resolved

reta commented Nov 28, 2022

View reviewed changes

gradle.properties Show resolved Hide resolved

reta commented Nov 28, 2022

View reviewed changes

subprojects/errorprone/errorprone.gradle Show resolved Hide resolved

reta force-pushed the issue-2798 branch from 29e009b to 2f513d2 Compare November 28, 2022 16:44

reta commented Nov 28, 2022

View reviewed changes

subprojects/errorprone/errorprone.gradle Show resolved Hide resolved

reta force-pushed the issue-2798 branch from 2f513d2 to 15a6265 Compare November 29, 2022 19:57

reta force-pushed the issue-2798 branch 3 times, most recently from fe59f40 to cd0c8f9 Compare November 30, 2022 14:12

reta force-pushed the issue-2798 branch 4 times, most recently from 42161f9 to af69a17 Compare November 30, 2022 16:18

reta commented Nov 30, 2022

View reviewed changes

subprojects/kotlinTest/src/test/kotlin/org/mockito/kotlin/CircularityTest.kt Show resolved Hide resolved

reta force-pushed the issue-2798 branch 2 times, most recently from 5c0902f to 877152e Compare November 30, 2022 18:31

reta commented Nov 30, 2022

View reviewed changes

subprojects/errorprone/errorprone.gradle Show resolved Hide resolved

reta force-pushed the issue-2798 branch from 877152e to 363a33f Compare November 30, 2022 18:45

reta marked this pull request as ready for review December 1, 2022 13:31

reta changed the title ~~[WIP] Update minimum support Java version from 8 to 11~~ Update minimum support Java version from 8 to 11 Dec 1, 2022

TimvdLippe reviewed Dec 12, 2022

View reviewed changes

reta mentioned this pull request Dec 13, 2022

Add new artifact mockito-subclass (to use mock-maker-subclass MockMaker) #2821

Merged

8 tasks

reta added 2 commits December 14, 2022 16:28

Update minimum support Java version from 8 to 11. Fixes mockito#2798

004f3f8

Signed-off-by: Andriy Redko <[email protected]>

Reverted the LocationFactory changes (as per code review comments)

1ce6b84

Signed-off-by: Andriy Redko <[email protected]>

reta force-pushed the issue-2798 branch from 18b37c0 to 1ce6b84 Compare December 14, 2022 21:29

TimvdLippe approved these changes Dec 18, 2022

View reviewed changes

TimvdLippe merged commit a7c7fdb into mockito:main Dec 18, 2022

xuwei-k added a commit to gitbucket/gitbucket that referenced this pull request Jan 14, 2023

pin mockito 4.x

f6d1e6b

mockito/mockito#2804

xuwei-k mentioned this pull request Jan 15, 2023

Update mockito-core to 5.0.0 scala-text/scala_text#1097

Closed

Neenu1995 mentioned this pull request Jan 30, 2023

test(deps): update dependency org.mockito:mockito-core to v5 googleapis/java-bigquery#2468

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update minimum support Java version from 8 to 11 #2804

Update minimum support Java version from 8 to 11 #2804

reta commented Nov 28, 2022

reta commented Nov 28, 2022

reta commented Nov 28, 2022

TimvdLippe commented Nov 28, 2022

reta commented Nov 28, 2022

reta commented Nov 29, 2022

reta commented Nov 30, 2022

reta commented Nov 30, 2022

codecov-commenter commented Dec 1, 2022 •

edited

Loading

TimvdLippe Dec 12, 2022

reta Dec 12, 2022

reta Dec 12, 2022

TimvdLippe commented Dec 12, 2022

TimvdLippe left a comment

TimvdLippe Dec 18, 2022

		@@ -24,26 +24,13 @@ private interface Factory {
		}

		private static Factory createLocationFactory() {

Update minimum support Java version from 8 to 11 #2804

Update minimum support Java version from 8 to 11 #2804

Conversation

reta commented Nov 28, 2022

Checklist

reta commented Nov 28, 2022

reta commented Nov 28, 2022

TimvdLippe commented Nov 28, 2022

reta commented Nov 28, 2022

reta commented Nov 29, 2022

reta commented Nov 30, 2022

reta commented Nov 30, 2022

codecov-commenter commented Dec 1, 2022 • edited Loading

Codecov Report

TimvdLippe Dec 12, 2022

Choose a reason for hiding this comment

reta Dec 12, 2022

Choose a reason for hiding this comment

reta Dec 12, 2022

Choose a reason for hiding this comment

TimvdLippe commented Dec 12, 2022

TimvdLippe left a comment

Choose a reason for hiding this comment

TimvdLippe Dec 18, 2022

Choose a reason for hiding this comment

codecov-commenter commented Dec 1, 2022 •

edited

Loading