From f52ced5e74ab1e13405e01df5b00cd6d568aa916 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 27 Apr 2021 20:49:56 -0400 Subject: [PATCH] v0.9.3: fixed desktop:release not working after gradle 7.0 --- desktop/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop/build.gradle b/desktop/build.gradle index afb0e7f2a..7661b0449 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -35,6 +35,8 @@ task compileForRelease(dependsOn: classes, type: JavaCompile){ } task release(dependsOn: compileForRelease, type: Jar) { + //FIXME this is now needed as of gradle 7.0, due to our weird sourceSets setup. Should see if there's a better way to do this + setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) from sourceSets.main.output from { sourceSets.release.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } } from { configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } }