-
-
Notifications
You must be signed in to change notification settings - Fork 423
Add new merge strategy Fail to PropertiesFileTransformer
#1856
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
Conversation
.../kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt
Outdated
Show resolved
Hide resolved
|
Wait a sec before merging this... |
Ah, strike that |
|
All good here |
...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
PropertiesFileTransformer - add MergeStrategy.FailFail to PropertiesFileTransformer
| 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()), | ||
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| 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(), | |
| ) |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Refs #1848.