Merged
Conversation
d0243bc to
3009e45
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3464 +/- ##
============================================
+ Coverage 85.74% 85.77% +0.02%
- Complexity 2951 2953 +2
============================================
Files 341 341
Lines 8946 8946
Branches 1114 1114
============================================
+ Hits 7671 7673 +2
Misses 988 988
+ Partials 287 285 -2 ☔ View full report in Codecov by Sentry. |
3528e52 to
e54583d
Compare
TimvdLippe
requested changes
Oct 12, 2024
buildSrc/src/main/kotlin/mockito.java-library-conventions.gradle.kts
Outdated
Show resolved
Hide resolved
buildSrc/src/main/kotlin/mockito.publication-conventions.gradle.kts
Outdated
Show resolved
Hide resolved
buildSrc/src/main/kotlin/mockito.publication-conventions.gradle.kts
Outdated
Show resolved
Hide resolved
TimvdLippe
approved these changes
Oct 16, 2024
Contributor
TimvdLippe
left a comment
There was a problem hiding this comment.
Thanks for all the work and fixing the commit messages as well, much appreciated!
Contributor
|
Ah, I merged some plugin updates and didn't realize that would cause merge conflicts again :( |
13f9cd0 to
2926146
Compare
…droid-tests Fixes #3446
Fixes #3446 # Conflicts: # gradle/libs.versions.toml
Applies eclipse plugin, idea plugin is not anymore necessary with IntelliJ Fixes #3446
Co-authored-by: Tim van der Lippe <[email protected]>
2926146 to
4888857
Compare
Closed
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
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.
This PR port most of the existing sparse Groovy DSL scripts as convention plugins, this is done to switch from decade old accumulation of scripting from the early days of Gradle to best practice of today. Fortunately our script were well split.
For the full motivation see #3446
At this stage, this PR port is almost a 1 to 1, i.e. it doesn't aim at introducing or changing the build behavior. It is not complete, the coverage, shipkit, spotless, licenses still remain to be converted.
tl;dr: what this PR does is changing
apply from: ....gradleto a convention pluginplugins { id("mockito....-conventions") }. THese plugin are added in the standardbuildSrcCreate the
buildSrcproject for the conventions pluginsJava lib config
java-library.gradle-->mockito.library-conventions.gradle.kts, which applies other convention plugins belowjava-library.gradle-->mockito.java-library-conventions.gradle.kts, also sets up Java related configurations found in the rootbuild.gradle, and appliesmockito.java-conventionsosgi.gradle-->mockito.osgi-conventions.gradle.kts, this only applies the plugin as config differ between mockito-core and mockito-junit-jupiter.java-publication.gradle-->mockito.publication-conventions.gradle.ktscheckstyle.gradle-->mockito.checkstyle-conventions.gradle.ktserrorprone.gradlemerged inmockito.java-library-conventions.gradle.ktsanimalSniffer config in
mockito-core/build.gradleandmockito-junit-jupiter/build.gradle--> extracted tomockito.java-backward-compatibility-checks-conventions.gradle.ktsTests
java-test.gradle-->mockito.test-conventions.gradle.kts(which appliesmockito.test-jfr-profiler-conventions,mockito.java-conventions)jfr.gradle-->mockito.test-jfr-profiler-conventions.gradle.ktstest-launcher.gradle-->mockito.test-launcher-conventions.gradle.ktsretry-test.gradle-->mockito.test-retry-conventions.gradle.ktsJavadoc
mockito-core/javadoc.gradleandmockito-junit-jupiter/javadoc.gradle-->mockito.javadoc-conventions.gradle.ktsmockito-core/src/main/javadoc->config/javadoc/resources, because it's shared with junit jupiter extension.Now Mockito Libraries (core and extensions) declare this
And integration tests have this
Android test project also applies our convention.
Two approaches for the review
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