Skip to content

Conversation

@snazy
Copy link
Contributor

@snazy snazy commented Nov 17, 2025

Refs #1848.


  • CHANGELOG's "Unreleased" section has been updated, if applicable.

@snazy
Copy link
Contributor Author

snazy commented Nov 17, 2025

Wait a sec before merging this...
I think the Gradle configuration cache "does not like" lazy's... (looking)

@snazy
Copy link
Contributor Author

snazy commented Nov 17, 2025

Wait a sec before merging this... I think the Gradle configuration cache "does not like" lazy's... (looking)

Ah, strike that

@snazy
Copy link
Contributor Author

snazy commented Nov 17, 2025

All good here

@Goooler Goooler changed the title PropertiesFileTransformer - add MergeStrategy.Fail Add new merge strategy Fail to PropertiesFileTransformer Nov 18, 2025
Comment on lines 86 to 94
assertThat(result.output).contains(
// TODO EXPERIMENT
"""
Execution failed for task ':shadowJar'.
> The following properties files have conflicting property values and cannot be merged:
* META-INF/test.properties
* Property key2 is duplicated 2 times with different values
""".trimIndent().replace("\n", System.lineSeparator()),
)
Copy link
Member

Choose a reason for hiding this comment

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

Image
Suggested change
assertThat(result.output).contains(
// TODO EXPERIMENT
"""
Execution failed for task ':shadowJar'.
> The following properties files have conflicting property values and cannot be merged:
* META-INF/test.properties
* Property key2 is duplicated 2 times with different values
""".trimIndent().replace("\n", System.lineSeparator()),
)
assertThat(result.output.replace(lineSeparator, "\n")).contains(
// TODO EXPERIMENT
"""
Execution failed for task ':shadowJar'.
> The following properties files have conflicting property values and cannot be merged:
* META-INF/test.properties
* Property key2 is duplicated 2 times with different values
""".trimIndent(),
)

Copy link
Member

Choose a reason for hiding this comment

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

assertThat(result.output.replace(lineSeparator, "\n")) would be better.

Copy link
Member

Choose a reason for hiding this comment

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

@Goooler Goooler requested a review from Copilot November 18, 2025 08:18
Copilot finished reviewing on behalf of Goooler November 18, 2025 08:20

This comment was marked as outdated.

@Goooler Goooler merged commit aa386eb into GradleUp:main Nov 18, 2025
13 checks passed
@snazy snazy deleted the pft-fail-mode branch November 18, 2025 08: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