Restructure build #14093
Restructure build #14093
Conversation
Since `project` is the default delegate, explicit references are unnecessary and can be removed for cleaner code.
Since `findProject` returns `null` for missing properties, we can leverage that to simplify getting and setting properties that can be provided from multiple sources.
Remove unnecessary curly brackets from `GString`s for improved readability.
This commit removes the explicit setting of `transitionCheckOption` for `nexusPublishing`. The default values are: - `maxRetries`: 60 - `delayBetween`: 10
Remove the explicit exclusion of `javaee-web-api-6.0.jar` for `groovydoc` and `javadoc` tasks, as it is no longer on the classpath.
This is handled automatically by Gradle since version 7 unless `allowInsecureProtocol` is explicitly set to `true`.
We are using `buildSrc` now. To list the build dependencies, do: - `cd buildSrc` - `gradle dependencies`
This was added a long time ago, but it's unclear to me why. It can be reverted if it's found to be required later.
Replace `manifest.mainAttributes()` with the public Gradle API method `manifest.attributes()`, avoiding reliance on the internal `DefaultManifest` class.
Eliminate outdated `groovy.jar` resolution, likely from a previous version of the Groovy joint compilation workflow.
Refactor file resolution to use `layout` API for better compatibility with Gradle's lazy evaluation and configuration cache.
The special handling of `async` projects appears to be unnecessary and can most probably be removed.
Clarify the code by directly using the `:grails-bom` project name instead of the variable, as the project name is already established.
Set the Maven repository publishing credentials directly, avoiding unnecessary use of variables.
Ensure consistency by aligning with the recommended usage of `MavenArtifactRepository.setUrl(URI)` for setting repository URLs.
- Remove unused properties in `ext` - Set credentials directly rather than using variables
The upgrade of transitive Groovy dependencies is no longer necessary.
Using the type-safe API for configuring the Nexus publish extension provides IDE type hints and auto-completion.
Set the root project version using `projectVersion` for consistency.
- Remove `subprojects` closure parameter and reference the delegate directly - Use lazy, type-safe API when configuring extensions - Replace `ext` properties with variables where possible - Eliminate unnecessary `uri()`` method in repository URL setters - Use `=` for setters and parentheses for methods for clarity - Remove unnecessary empty string default when `null` suffices
grails-docs classes are used in Gradle builds, so we must compile with Groovy 3 to ensure compatibility (until Gradle upgrades to Groovy 4).
The source jars are already included in the `dist` directory in the distribution. No need to duplicate them also in the `src` directory. Previously, for some reason, also `grails-datastore*` source jars where included in the distribution `src` directory, but after recent changes that was no longer the case.
The version should be resolved from `grails-bom` now.
We could, but I think we are only wasting build time. The demo33 project smoke tests the Gradle plugins. |
We don't know how these projects would diverge over time so it's safe to add them to all of them. Specifically, micronaut is likely going to be different than the base grails app so it's probably critical to have it there at the least. |
|
I tested grails-shell CLI zip and these changes add a doc directory with groovydocs (1,815 files) whereas it was 222 files total before. I think we should skip the docs in the zip distribution. Additionally this issue https://github.com/apache/grails-core/pull/14065/files is back on Windows. |
I guess we should skip the withJavadoc() for the cli project? |
It seems dependency configuration excludes do not affect inherited dependencies. Related: apachegh-14065
Are you sure this has changed? I checked the previous release (v7.0.0-M3), and it appears to include the API docs in the doc subdirectory. |
This aligns with previous zip distribution releases.
This commit adds back the 'org.grails.grails-gsp' and `org.grails.plugins.views-json` Gradle Plugins to the functional tests. This will act as a smoke test that production compilation of views does not fail when building.
There was a problem hiding this comment.
@matrei The changes for the CLI on windows work perfectly.
I went back and checked and you are correct on the doc directory being present for 7.0.0-M3 and 7.0.0-M1. The doc directory was not present on 6.2.x distributions and I have created an issue to explore that separately. #14100
Great work reorganizing this build!!!
Make the build composition based.