🔀 Merge branch 'website/epic-games' into next

[rhynodge.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index c25226b..9e286ff 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -55,18 +55,20 @@ dependencies {
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     testImplementation group: "junit", name: "junit", version: "4.13.2"
-    testImplementation group: "org.hamcrest", name: "hamcrest-library", version: "1.3"
-    testImplementation group: "org.mockito", name: "mockito-core", version: "1.9.5"
+    testImplementation group: "org.hamcrest", name: "hamcrest", version: "2.2"
+    testImplementation group: "org.mockito", name: "mockito-core", version: "5.11.0"
+    testImplementation group: "com.spotify", name: "hamcrest-jackson", version: "1.3.2"
 }
 
 task fatJar(type: Jar) {
-    baseName = project.name + "-all"
+    archiveBaseName.set(project.name + "-all")
     manifest {
         attributes(
                 "Main-Class": "net.pterodactylus.rhynodge.engine.Starter"
         )
     }
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    from { configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     from { sourceSets.generated.resources.srcDirs }
     with jar
     dependsOn test
@@ -88,6 +90,9 @@ task createVersion() {
     processResources.dependsOn(createVersion)
 }
 
+tasks.named("processGeneratedResources") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
 
 import org.ajoberstar.grgit.Grgit
 createVersion {