Move core sources to mockito-core module #3453
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3453 +/- ##
=========================================
Coverage 85.76% 85.76%
Complexity 2950 2950
=========================================
Files 339 339
Lines 8941 8941
Branches 1117 1117
=========================================
Hits 7668 7668
Misses 984 984
Partials 289 289 ☔ View full report in Codecov by Sentry. |
4c4a8d9 to
6641c7b
Compare
|
After a Manifest (agent and osgi properties): Javadoc looks fine too. |
|
We currently name our folders without the |
|
I pondered on that, I thought it was better to have the top level projects starting with I don't have opinions on our extension folders though, so I'm ok as it is or to rename them as |
|
I agree it should be consistent. A newcomer might otherwise always wonder. Either way works for me. |
|
To make reviewing this easier, let's decide on a folder structure for the extensions and land that in a separate PR. I personally don't mind our sources folders order to be mixed with other configuration, but I do also appreciate the grouping. Given the option, I do agree with the proposal that all projects are prefixed with While these are mostly philosophical questions, I think we should list the options, make a decision and move on. Ultimately I don't think there is a perfect option, so let's be pragmatic as well. But I do want us to make a decision before we move, as we already have moved the folder structure for extensions and now do it again. Let's try to keep our git history as clean as we can, avoiding multiple moves. |
a64053d to
6641c7b
Compare
8 tasks
|
@bric3 Can you please update the wording of the commit messages to follow the structure we use for the other commits? |
TimvdLippe
approved these changes
Oct 5, 2024
| apply from: 'gradle/shipkit.gradle' | ||
|
|
||
| apply from: 'gradle/root/ide.gradle' | ||
| apply from: 'gradle/root/gradle-fix.gradle' |
There was a problem hiding this comment.
I don't see this file in either the rootProject or in mockito-core. Does that mean it is unused now and should we delete it? It seems like it should be part of the rootProject, but looking at the contents of the file, I am not sure if it is still relevant on recent versions of Gradle.
There was a problem hiding this comment.
Yeah I didn't add the fix since it is not anymore necessary.
My plan is to drop this file in subsequent work on build scripts. I can do it now though.
Ah yes, I'm using conventional commits in every day usage and didn't realize this didn't follow the convention there. Edit : Done |
Previously, the source code for the `mockito-core` artifact lived in `/src/main/java` and the configuration was part of the `rootProject`. With this change, we align the `mockito-core` as a separate artifact similar to the recent move to split up the extension projects into `mockito-extensions`. Fixes #3444
As a follow-up to the split of `mockito-extensions` and `mockito-integration-tests` this commit renames all extension projects to use the `mockito-` prefix. This way, the project names reflect the published artifact ID's on Maven Central.
63a245c to
b612b97
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moves the core sources to a
mockito-coremodule, this has several benefits mentioned in #3444build.gradle.With this change the structure will look like
Previous history is possible using git
--follow, IJ does that automatically (you can also click the colored line on the left the file history to expand the name).Fixes #3444
Checklist
including project members to get a better picture of the change
commit is meaningful and help the people that will explore a change in 2 years
Fixes #<issue number>in the description if relevantFixes #<issue number>if relevant