Skip to content
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.

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

[Simplify] Flatten DefaultAssertJGeneratorOptions into single class #31

Merged
merged 5 commits into from
Apr 22, 2023

Conversation

Nava2
Copy link
Collaborator

@Nava2 Nava2 commented Apr 22, 2023

This flattens the DefaultAssertJGeneratorOptions into a single class AssertJGeneratorOptions as the "Default" version was always used. This greatly simplifies the code and removes the strangely existing java interface that remained.

Extracted from #29 without Konvert yet.

Nava2 added a commit that referenced this pull request Apr 22, 2023
…mplates`

This is extracted from #31

This removes unused methods that were knock ons from #30. This fixes issues with serialization of the `Templates` value when computing if the tasks should run.
…mplates`

This is extracted from #31

This removes unused methods that were knock ons from #30. This fixes issues with serialization of the `Templates` value when computing if the tasks should run.
…le extensions

This replaces the "Conventions" and "custom source sets" in favour of
using a simple task + `extension` on any `SourceSet` that are defined.
This *greatly* simplifies the code and matches all tests still. Further,
this properly adds support for incremental changes in templates as they
were not correctly implemented before.

This was extracted from #17.
Nava2 added a commit that referenced this pull request Apr 22, 2023
… extension directly attached to `sourceSet`

This removes the custom `AssertJSourceSet` which was not adding value with the new functionality in modern gradle that generates methods to configure extensions for those that they are attached to. For example, the `assertJ {}` closure is handled by the `extension` rather than adding a new `SourceSet` type.

This was extracted from #31
Nava2 added a commit that referenced this pull request Apr 22, 2023
… extension directly attached to `sourceSet`

This removes the custom `AssertJSourceSet` which was not adding value with the new functionality in modern gradle that generates methods to configure extensions for those that they are attached to. For example, the `assertJ {}` closure is handled by the `extension` rather than adding a new `SourceSet` type.

This was extracted from #31
Nava2 added a commit that referenced this pull request Apr 22, 2023
… extension directly attached to `sourceSet`

This removes the custom `AssertJSourceSet` which was not adding value with the new functionality in modern gradle that generates methods to configure extensions for those that they are attached to. For example, the `assertJ {}` closure is handled by the `extension` rather than adding a new `SourceSet` type.

This was extracted from #31
Nava2 added a commit that referenced this pull request Apr 22, 2023
This was objectively wrong and shouldnt have been done. The correct approach is to register this plugin when the `java` plugin is registered.

Extracted from #31
Nava2 added a commit that referenced this pull request Apr 22, 2023
This was objectively wrong and shouldnt have been done. The correct approach is to register this plugin when the `java` plugin is registered.

Extracted from #31
Nava2 added a commit that referenced this pull request Apr 22, 2023
This was objectively wrong and shouldnt have been done. The correct approach is to register this plugin when the `java` plugin is registered.

Extracted from #31
Nava2 added a commit that referenced this pull request Apr 22, 2023
…mplates`

This is extracted from #31

This removes unused methods that were knock ons from #30. This fixes issues with serialization of the `Templates` value when computing if the tasks should run.
Nava2 added a commit that referenced this pull request Apr 22, 2023
…mplates` (#32)

This is extracted from #31

This removes unused methods that were knock ons from #30. This fixes issues with serialization of the `Templates` value when computing if the tasks should run.

Fixes #15.
Nava2 added 2 commits April 22, 2023 15:57
… extension directly attached to `sourceSet`

This removes the custom `AssertJSourceSet` which was not adding value with the new functionality in modern gradle that generates methods to configure extensions for those that they are attached to. For example, the `assertJ {}` closure is handled by the `extension` rather than adding a new `SourceSet` type.

This was extracted from #31
@Nava2 Nava2 force-pushed the kevin/remove-convention-garbage branch from 7f88eb5 to a4ecbaf Compare April 22, 2023 20:04
@Nava2 Nava2 changed the base branch from main to kevin/remove-custom-source-set April 22, 2023 20:04
}

project.afterEvaluate {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

None of this was needed...

Base automatically changed from kevin/remove-custom-source-set to main April 22, 2023 20:08
Nava2 added a commit that referenced this pull request Apr 22, 2023
#33)

… extension directly attached to `sourceSet`

This removes the custom `AssertJSourceSet` which was not adding value with the new functionality in modern gradle that generates methods to configure extensions for those that they are attached to. For example, the `assertJ {}` closure is handled by the `extension` rather than adding a new `SourceSet` type.

This was extracted from #31
@Nava2 Nava2 changed the title [Simplification] Remove conventions and source sets in favour of simp… [Simplification] Flatten DefaultAssertJGeneratorOptions into single class Apr 22, 2023
@Nava2 Nava2 changed the title [Simplification] Flatten DefaultAssertJGeneratorOptions into single class [Simplify] Flatten DefaultAssertJGeneratorOptions into single class Apr 22, 2023
@Nava2 Nava2 requested a review from scordio April 22, 2023 20:15
@Nava2 Nava2 merged commit 4c5c03d into main Apr 22, 2023
@Nava2 Nava2 deleted the kevin/remove-convention-garbage branch April 22, 2023 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants