X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=build.gradle;h=9e286ff10bb67c10f5aa828f6dfbed30769c783f;hb=HEAD;hp=b8c26530e3a98f95f18b14561effb90cb60c2335;hpb=d176fca28f0db80c67c7eb2cbb60638d213b9917;p=rhynodge.git

diff --git a/build.gradle b/build.gradle
index b8c2653..9e286ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,10 +14,19 @@ plugins {
     id('org.jetbrains.kotlin.jvm') version '1.9.20'
 }
 
-apply plugin: "war"
 apply plugin: "jacoco"
 apply plugin: "idea"
 
+kotlin {
+    jvmToolchain(17)
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 idea {
     project {
         languageLevel = "17"
@@ -27,16 +36,11 @@ idea {
 group = "net.pterodactylus"
 version = "0.1"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
-    implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib", version: kotlinVersion
     implementation group: "com.google.guava", name: "guava", version: "14.0-rc1"
     implementation group: "log4j", name: "log4j", version: "1.2.17"
     implementation group: "org.apache.httpcomponents", name: "httpclient", version: "4.4"
@@ -51,21 +55,28 @@ 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"
-	manifest {
-		attributes(
-			"Main-Class": "net.pterodactylus.rhynodge.engine.Starter"
-		)
-	}
-	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-	from { sourceSets.generated.resources.srcDirs }
-	with jar
-	dependsOn test
+    archiveBaseName.set(project.name + "-all")
+    manifest {
+        attributes(
+                "Main-Class": "net.pterodactylus.rhynodge.engine.Starter"
+        )
+    }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    from { configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+    from { sourceSets.generated.resources.srcDirs }
+    with jar
+    dependsOn test
+}
+
+tasks.named('test') {
+    jvmArgs += "--add-opens=java.base/java.lang=ALL-UNNAMED"
+    jvmArgs += "--add-opens=java.base/java.util=ALL-UNNAMED"
 }
 
 task createVersion() {
@@ -79,6 +90,9 @@ task createVersion() {
     processResources.dependsOn(createVersion)
 }
 
+tasks.named("processGeneratedResources") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
 
 import org.ajoberstar.grgit.Grgit
 createVersion {
@@ -90,13 +104,8 @@ createVersion {
     }
 }
 
-war {
-    classpath sourceSets.generated.output
-    dependsOn(test)
-}
-
 jacoco {
-    toolVersion = "0.7.6.201602180812"
+    toolVersion = "0.8.11"
 }
 
 /* vim: set ts=4 sw=4 et: */