From bb2b784f4f0070a690362577a299dd4499efe69f Mon Sep 17 00:00:00 2001 From: gamma-delta <29877714+gamma-delta@users.noreply.github.com> Date: Fri, 27 May 2022 17:02:51 -0500 Subject: [PATCH] hopefully let CI work again (man i can't believe no one checked in that long) --- Fabric/build.gradle | 2 -- Forge/build.gradle | 2 -- build.gradle | 7 +++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 24ed19d3..bd7f7fe5 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -91,8 +91,6 @@ processResources { filesMatching("fabric.mod.json") { expand "version": project.version } - - duplicatesStrategy 'exclude' } setupJar(this) diff --git a/Forge/build.gradle b/Forge/build.gradle index 38de6846..0f5b88b4 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -167,8 +167,6 @@ processResources { filesMatching("mods.toml") { expand "version": project.version } - - duplicatesStrategy 'exclude' } jar.finalizedBy('reobfJar') diff --git a/build.gradle b/build.gradle index 4ba1254a..b21cf0ed 100644 --- a/build.gradle +++ b/build.gradle @@ -132,6 +132,13 @@ subprojects { java.toolchain.languageVersion = JavaLanguageVersion.of(17) java.withSourcesJar() java.withJavadocJar() + + processResources { + duplicatesStrategy 'exclude' + } + sourcesJar { + duplicatesStrategy 'exclude' + } } allprojects { gradle.projectsEvaluated { tasks.withType(JavaCompile) { options.compilerArgs << "-Xmaxerrs" << "1000" } } }