From 83ebdc492e620a6217b3a545faa8dc81ea381fc2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Thu, 7 Mar 2024 20:54:12 +0100 Subject: [PATCH] =?utf8?q?=F0=9F=91=B7=20Update=20Gradle=20to=208.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 17a9e89..69fff10 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ dependencies { } task fatJar(type: Jar) { - baseName = project.name + "-all" + archiveBaseName.set(project.name + "-all") manifest { attributes( "Main-Class": "net.pterodactylus.rhynodge.engine.Starter" @@ -89,6 +89,9 @@ task createVersion() { processResources.dependsOn(createVersion) } +tasks.named("processGeneratedResources") { + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} import org.ajoberstar.grgit.Grgit createVersion { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 111cb7b..a9d6344 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip -- 2.7.4