From 6d8cd0c091be30d13911ee8a95898059a9022570 Mon Sep 17 00:00:00 2001
From: R0bbyYT <r0bby@gmx.net>
Date: Wed, 19 May 2021 18:12:36 +0200
Subject: [PATCH] Duplicates strategy defined, bump gradle-plugin version to
 2.10.1

---
 build.gradle.kts                                           | 2 +-
 src/main/java/net/flintmc/gradle/java/JarTaskProvider.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4674f79..caaca38 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -71,7 +71,7 @@ repositories {
     mavenCentral()
 }
 
-version = System.getenv().getOrDefault("VERSION", "2.10.0")
+version = System.getenv().getOrDefault("VERSION", "2.10.1")
 
 dependencies {
     implementation(group = "com.fasterxml.jackson.core", name = "jackson-core", version = "2.11.1")
diff --git a/src/main/java/net/flintmc/gradle/java/JarTaskProvider.java b/src/main/java/net/flintmc/gradle/java/JarTaskProvider.java
index 853c3ca..2f4f92e 100644
--- a/src/main/java/net/flintmc/gradle/java/JarTaskProvider.java
+++ b/src/main/java/net/flintmc/gradle/java/JarTaskProvider.java
@@ -29,6 +29,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.plugins.ExtraPropertiesExtension;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSet;
@@ -239,6 +240,7 @@ public void createJarBundledInstallerTask(Project project, FlintSelfInstallerExt
       bundledInstallerJarTask.getArchiveClassifier().set("bundled-installer");
       bundledInstallerJarTask.setGroup("build");
       bundledInstallerJarTask.dependsOn(mainJarTask);
+      bundledInstallerJarTask.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE);
 
       Map<String, String> bundle = new HashMap<>();