Add new merge strategy Fail to PropertiesFileTransformer#1856
Merged
Goooler merged 14 commits intoGradleUp:mainfrom Nov 18, 2025
Merged
Add new merge strategy Fail to PropertiesFileTransformer#1856Goooler merged 14 commits intoGradleUp:mainfrom
Fail to PropertiesFileTransformer#1856Goooler merged 14 commits intoGradleUp:mainfrom
Conversation
Goooler
reviewed
Nov 17, 2025
.../kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Wait a sec before merging this... |
Contributor
Author
Ah, strike that |
Contributor
Author
|
All good here |
1 task
Goooler
reviewed
Nov 18, 2025
...lin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
Outdated
Show resolved
Hide resolved
...lin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
Outdated
Show resolved
Hide resolved
.../kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt
Outdated
Show resolved
Hide resolved
.../kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt
Show resolved
Hide resolved
Co-authored-by: Zongle Wang <wangzongler@gmail.com>
Goooler
reviewed
Nov 18, 2025
PropertiesFileTransformer - add MergeStrategy.FailFail to PropertiesFileTransformer
Goooler
reviewed
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()), | ||
| ) |
Member
There was a problem hiding this comment.
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(), | |
| ) |
Member
There was a problem hiding this comment.
assertThat(result.output.replace(lineSeparator, "\n")) would be better.
1 task
Goooler
approved these changes
Nov 18, 2025
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.
Refs #1848.