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

Make Gradle properties available to settings scripts #12401

Merged
merged 13 commits into from Mar 4, 2020

Conversation

bamboo
Copy link
Member

@bamboo bamboo commented Mar 2, 2020

By ensuring GradleProperties is loaded before processing the settings scripts of any included builds.

The integration with instant execution is mediated by the newly introduced GradlePropertiesController service which guarantees GradleProperties is loaded only once during a build and from the correct location.

Fixes #12381

@bamboo bamboo self-assigned this Mar 2, 2020
@bamboo bamboo requested a review from adammurdoch March 2, 2020 22:45
@bamboo bamboo changed the base branch from master to release March 2, 2020 23:02
@big-guy big-guy added this to the 6.2.2 milestone Mar 2, 2020
@bamboo bamboo changed the title Reinstate PropertiesLoadingSettingsProcessor Make Gradle properties available to settings scripts Mar 3, 2020
@bamboo bamboo added the a:regression This used to work label Mar 3, 2020
bamboo added 13 commits March 3, 2020 22:41
To ensure `GradleProperties` is loaded before processing the settings scripts of
any included builds.

The integration with instant execution is mediated by the newly introduced
`GradlePropertiesController` service which guarantees `GradleProperties` is
loaded only once during a build and from the correct location.

Fixes #12381
…t scripts for buildSrc`

As it cannot be safely implemented with the current init scripts semantics as
init scripts can influence the settings file location thus influencing the
location of the `gradle.properties` file.
…ct properties being available to buildSrc"

This reverts commit 1a70869

Signed-off-by: Rodrigo B. de Oliveira <rodrigo@gradle.com>
Also test for the availability of Gradle properties in `settings.gradle`.
The broken behavior is present in 6.2 and 6.2.1.
@bamboo bamboo force-pushed the bamboo/release/ie/composite-gradle-properties branch from 087a2f7 to d4eff18 Compare March 4, 2020 02:03
@bamboo bamboo merged commit 7d0bf6d into release Mar 4, 2020
eskatos added a commit that referenced this pull request Mar 4, 2020
…site-gradle-properties"

This reverts commit 7d0bf6d, reversing
changes made to 50234ac.
@bamboo bamboo deleted the bamboo/release/ie/composite-gradle-properties branch March 5, 2020 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

multi-project build use the properties of the rootProject for all included builds (changed in 6.2)
2 participants