Skip to content

Add support for including module-info in Mockito. #3597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimvdLippe merged 26 commits into from
Mar 3, 2025
Merged

Add support for including module-info in Mockito. #3597

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ff11c30
Add module-info and import injected module.
raphw Feb 22, 2025
5cb2254
Avoid error during javadoc generation.
raphw Feb 23, 2025
7a6ab7b
Add junit static reference.
raphw Feb 23, 2025
e1c5d18
Add module read adjustment for plugin initializer.
raphw Feb 23, 2025
02a0f16
Clean up formatting.
raphw Feb 23, 2025
0fb978d
Complete module system integration.
raphw Feb 23, 2025
bd6faed
Remove module-info from code-empty jars as they will unlikely need to…
raphw Feb 23, 2025
451cf6b
Add test module.
raphw Feb 23, 2025
602a4e5
Fix jar resolution.
raphw Feb 23, 2025
e3201cb
Improve error message.
raphw Feb 24, 2025
dc2292f
Remove package-info.
raphw Feb 24, 2025
547e7e4
Add comment for transfer.
raphw Feb 24, 2025
898987e
Adjust build to transform module info.
raphw Feb 26, 2025
22bde40
Add transformation for module-info.
raphw Feb 26, 2025
0757e59
Attempt compatible renaming.
raphw Feb 26, 2025
825009d
Adjust build and test.
raphw Feb 28, 2025
051e8a7
Adjust OSGi to avoid artificial package.
raphw Mar 2, 2025
d5c775f
Fix export for internal dispatcher implementation.
raphw Mar 2, 2025
63dd38b
Unseal loader prior to injection.
raphw Mar 2, 2025
adf6b25
Read jdk.unsupported to allow use of internal API if requested.
raphw Mar 2, 2025
5de7543
Remove comment.
raphw Mar 2, 2025
2265a5e
Fix javadoc task.
raphw Mar 3, 2025
94509e1
Remove IntelliJ added import.
raphw Mar 3, 2025
ddeb779
Fix comment.
raphw Mar 3, 2025
834dbe1
Make code more readable.
raphw Mar 3, 2025
5ca72f9
Improve error message.
raphw Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix comment.
  • Loading branch information
@raphw
raphw committed Mar 3, 2025
commit ddeb779325de8cf8091c4127e1ee642d8ccf99a3
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/mockito.javadoc-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tasks.named<Javadoc>("javadoc") {
inputs.dir(javadocConfigDir)
description = "Creates javadoc html for ${project.name}."

// Woraround as suggested in https://github.com/gradle/gradle/issues/19726
// Work-around as suggested in https://github.com/gradle/gradle/issues/19726
val sourceSetDirectories = sourceSets.main.get().java.sourceDirectories.joinToString(":")
val coreOptions = options as CoreJavadocOptions
coreOptions.addStringOption("-source-path", sourceSetDirectories)
Expand Down