Skip to content

Commit 7bd833e

Browse files
authored
Merge pull request #27 from FlintMC/feature/duplicates-strategy
Duplicates strategy defined, bump gradle-plugin version to 2.10.1
2 parents 463bdf4 + 6d8cd0c commit 7bd833e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ repositories {
7171
mavenCentral()
7272
}
7373

74-
version = System.getenv().getOrDefault("VERSION", "2.10.0")
74+
version = System.getenv().getOrDefault("VERSION", "2.10.1")
7575

7676
dependencies {
7777
implementation(group = "com.fasterxml.jackson.core", name = "jackson-core", version = "2.11.1")

src/main/java/net/flintmc/gradle/java/JarTaskProvider.java

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.gradle.api.GradleException;
3030
import org.gradle.api.Project;
3131
import org.gradle.api.artifacts.Configuration;
32+
import org.gradle.api.file.DuplicatesStrategy;
3233
import org.gradle.api.plugins.ExtraPropertiesExtension;
3334
import org.gradle.api.plugins.JavaPluginConvention;
3435
import org.gradle.api.tasks.SourceSet;
@@ -239,6 +240,7 @@ public void createJarBundledInstallerTask(Project project, FlintSelfInstallerExt
239240
bundledInstallerJarTask.getArchiveClassifier().set("bundled-installer");
240241
bundledInstallerJarTask.setGroup("build");
241242
bundledInstallerJarTask.dependsOn(mainJarTask);
243+
bundledInstallerJarTask.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE);
242244

243245
Map<String, String> bundle = new HashMap<>();
244246

0 commit comments

Comments
 (0)