chore(spin-java-module, spin-junit-module): unify detect resolution - #175
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
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.
AbstractDetectTestResolutionused to duplicate the entireAbstractDetectResolutionalgorithm just to override two protected hook methods (additionalSiblingCandidates()andadditionalArtifacts()) for TEST-scope resolutions, keeping the main-vs-test specialization at the Java subclassing level.This replaces that with a DI-driven approach.
Plugingains a new default method,contributeBindings(Binder), invoked byDefaultProgramonce perTaskcontext before the task is instantiated, so contributed bindings are visible to its injection points.AbstractJavaPluginandAbstractJUnitPluginnow each provide aSourcePathKind-typedscope()via@Provides(MAINvsTEST), andAbstractJUnitPluginusescontributeBindingsto multibind the JUnit Platform ConsoleLauncher and Jupiter engine artifacts into aSet<Artifact>thatAbstractDetectResolutioninjects directly asadditionalInfrastructureArtifacts.AbstractDetectResolution.create()now gates the TEST-only sibling-main-output lookup on the injectedscopefield instead of delegating to an overridable hook.AbstractDetectTestResolutionis deleted; its static helpers (jupiterVersion,jupiterMajorVersion,derivePlatformVersion) move ontoAbstractJUnitPlugin, andJava25JUnitPlugin/Java8JUnitPlugin'sDetectTestResolutioninner classes now extendAbstractDetectResolutiondirectly, matching how the main-scope compiler plugins already worked.This is scoped to the detect-resolution merge only. The related
"main/"/"test/"build-output-prefix literals still duplicated across the Compile tasks and bothResourcePlugins, andCleanPlugin's lack of any main/test/generated distinction, are deliberately out of scope here and left for a follow-up -- theSourcePathKind@Provideswiring added in this change is meant to be the reusable foundation for that follow-up.