Skip to content

Commit 4fd236a

Browse files
authored
Add DuplicatesStrategy to sync task in CollectModlDependencies (#64)
Grade requires this on collisions. Adding this will warn on the build about the collision but not prevent it. this was allowed in previous gradle versions.
1 parent f8ab54a commit 4fd236a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

gradle-module-plugin/Contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ change you wish to make with the project maintainers via issue or the IA forums.
1010

1111
1. Ensure any local files or dependencies are removed before pushing
1212
2. Verify that new functionality is supported through new test cases when applicable
13-
2. Update the README.md with details of changes to tasks, interfaces or behavior, including new environment
13+
3. Update the README.md with details of changes to tasks, interfaces or behavior, including new environment
1414
variables, properties, useful file locations, etc.
15-
3. Make sure that the changes in the PR conform to the code formatting by running `./gradlew check` in the appropriate project
15+
4. Make sure that the changes in the PR conform to the code formatting by running `./gradlew check` in the appropriate project
1616

1717

gradle-module-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
}
2121

2222
group = "io.ia.sdk"
23-
version = "0.4.0"
23+
version = "0.4.1"
2424

2525
configurations {
2626
val functionalTestImplementation by registering {

gradle-module-plugin/src/main/kotlin/io/ia/sdk/gradle/modl/task/CollectModlDependencies.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.gradle.api.DefaultTask
1313
import org.gradle.api.artifacts.Configuration
1414
import org.gradle.api.artifacts.result.ResolvedArtifactResult
1515
import org.gradle.api.file.DirectoryProperty
16+
import org.gradle.api.file.DuplicatesStrategy
1617
import org.gradle.api.file.ProjectLayout
1718
import org.gradle.api.file.RegularFile
1819
import org.gradle.api.model.ObjectFactory
@@ -142,6 +143,7 @@ open class CollectModlDependencies @Inject constructor(objects: ObjectFactory, l
142143
project.sync { copySpec ->
143144
copySpec.from(artifacts.map { it.jarFile })
144145
copySpec.into(artifactOutputDir.get())
146+
copySpec.duplicatesStrategy = DuplicatesStrategy.WARN
145147
}
146148
}
147149
}

0 commit comments

Comments
 (0)