Skip to content

Commit bddc93e

Browse files
committed
Update the comment about duplicatesStrategy
1 parent 866055f commit bddc93e

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,6 @@ class ServiceFileTransformerTest : BaseTransformerTest() {
196196
assertThat(content).isEqualTo(CONTENT_THREE + "\n" + CONTENT_ONE_TWO)
197197
}
198198

199-
/**
200-
* See https://github.com/gradle/gradle/blob/df5bc230c57db70aa3f6909403e5f89d7efde531/platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecorator.java#L54-L65.
201-
*/
202199
@ParameterizedTest
203200
@MethodSource("withThrowingProvider")
204201
fun honorDuplicatesStrategyWithThrowing(
@@ -215,9 +212,6 @@ class ServiceFileTransformerTest : BaseTransformerTest() {
215212
}
216213
}
217214

218-
/**
219-
* See https://github.com/gradle/gradle/blob/df5bc230c57db70aa3f6909403e5f89d7efde531/platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecorator.java#L54-L65.
220-
*/
221215
@ParameterizedTest
222216
@MethodSource("withoutThrowingProvider")
223217
fun honorDuplicatesStrategyWithoutThrowing(

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public abstract class ShadowJar :
5959
}
6060

6161
init {
62-
// Shadow filters out files later. This was the default behavior in Gradle < 6.x
62+
// https://github.com/gradle/gradle/blob/df5bc230c57db70aa3f6909403e5f89d7efde531/platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecorator.java#L55-L64
6363
duplicatesStrategy = DuplicatesStrategy.INCLUDE
6464
manifest = DefaultInheritManifest(services.get(FileResolver::class.java))
6565

0 commit comments

Comments
 (0)