Skip to content

Clean up JDK-8 related code#2883

Merged
TimvdLippe merged 7 commits intomockito:mainfrom
reta:issue-2879
Jan 24, 2023
Merged

Clean up JDK-8 related code#2883
TimvdLippe merged 7 commits intomockito:mainfrom
reta:issue-2879

Conversation

@reta
Copy link
Copy Markdown
Contributor

@reta reta commented Jan 22, 2023 •
edited
Loading

Signed-off-by: Andriy Redko drreta@gmail.com

Clean up JDK-8 related code.
Fixes #2879

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

@reta
Clean up JDK-8 related code
7677df3 
Signed-off-by: Andriy Redko <drreta@gmail.com>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jan 22, 2023 •
edited
Loading

Codecov Report

Base: 83.69% // Head: 85.81% // Increases project coverage by +2.11% 🎉

Coverage data is based on head (b196998) compared to base (91223f8).
Patch coverage: 90.47% of modified lines in pull request are covered.

Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #2883      +/-   ##
============================================
+ Coverage     83.69%   85.81%   +2.11%     
+ Complexity     2861     2844      -17     
============================================
  Files           327      324       -3     
  Lines          8785     8601     -184     
  Branches       1068     1059       -9     
============================================
+ Hits           7353     7381      +28     
+ Misses         1155      947     -208     
+ Partials        277      273       -4
Impacted Files Coverage Δ
...on/bytebuddy/InlineDelegateByteBuddyMockMaker.java 77.56% <ø> (+0.63%) ⬆️
...creation/bytebuddy/SubclassByteBuddyMockMaker.java 52.11% <ø> (+2.11%) ⬆️
.../main/java/org/mockito/internal/util/Platform.java 72.72% <ø> (-4.20%) ⬇️
...al/stubbing/defaultanswers/ReturnsEmptyValues.java 96.96% <90.00%> (ø)
...rg/mockito/internal/debugging/LocationFactory.java 100.00% <100.00%> (+33.33%) ⬆️
.../internal/creation/bytebuddy/MockMethodAdvice.java 81.94% <0.00%> (+0.28%) ⬆️
...l/stubbing/answers/AnswerFunctionalInterfaces.java 94.79% <0.00%> (+1.04%) ⬆️
.../creation/bytebuddy/SubclassBytecodeGenerator.java 69.18% <0.00%> (+2.90%) ⬆️
...rnal/creation/bytebuddy/MockMethodInterceptor.java 77.77% <0.00%> (+7.40%) ⬆️
...ckito/internal/creation/bytebuddy/TypeSupport.java 78.57% <0.00%> (+21.42%) ⬆️
... and 4 more

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
TimvdLippe reviewed Jan 22, 2023
View reviewed changes
Comment thread src/main/java/org/mockito/internal/debugging/LocationFactory.java Outdated
TimvdLippe
TimvdLippe reviewed Jan 22, 2023
View reviewed changes
Comment thread src/main/java/org/mockito/internal/debugging/Java9PlusLocationImpl.java
@reta
Remove JavaEightUtil class
357cae9 
Signed-off-by: Andriy Redko <drreta@gmail.com>
@reta
Bump Android API level signatures to 26 in order to access Period / D…
7fbaad4 
…uration classes

Signed-off-by: Andriy Redko <drreta@gmail.com>
reta
reta commented Jan 23, 2023
View reviewed changes
Comment thread build.gradle
@reta
Fix Kotlin tests compiler settings
6aab5bd 
Signed-off-by: Andriy Redko <drreta@gmail.com>
reta
reta commented Jan 23, 2023
View reviewed changes
Comment thread subprojects/kotlinReleaseCoroutinesTest/kotlinReleaseCoroutinesTest.gradle
reta added 2 commits January 23, 2023 21:08
@reta
Clean up Platform from Java 8 related code
62a5cc7 
Signed-off-by: Andriy Redko <drreta@gmail.com>
@reta
Fix Android Kotlin compiler settings
b196998 
Signed-off-by: Andriy Redko <drreta@gmail.com>
@reta reta marked this pull request as ready for review January 24, 2023 02:33
@reta
Copy link
Copy Markdown
Contributor Author

reta commented Jan 24, 2023

@TimvdLippe please let me know if I missed some places, I think we are good to go, thank you!

TimvdLippe
TimvdLippe approved these changes Jan 24, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@TimvdLippe TimvdLippe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome thank you!

@TimvdLippe TimvdLippe merged commit 4775c67 into mockito:main Jan 24, 2023
@TWiStErRob
Copy link
Copy Markdown
Contributor

TWiStErRob commented Feb 5, 2023

Note: this was partially reverted in #2891 to supply Android compatibility.

This was referenced Feb 5, 2023
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TimvdLippe TimvdLippe TimvdLippe approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Clean up JDK-8 related code

4 participants

@reta @codecov-commenter @TWiStErRob @TimvdLippe