Duplicates strategy defined, bump gradle-plugin version to 2.10.1

FlintMC · May 19, 2021 · 6d8cd0c · 6d8cd0c
1 parent 463bdf4
commit 6d8cd0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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<>();