X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=build.gradle;h=85cf007897f9c07ba9f2d84cefafed7c34954713;hb=a189d8ef75e86a2120372916c95422e77b40538e;hp=8f3874d276c649ded70f8a77f6c8c19273c267aa;hpb=5cb5434d6407a368593fabc1ddd32ad9ca568194;p=rhynodge.git diff --git a/build.gradle b/build.gradle index 8f3874d..85cf007 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,16 @@ plugins { apply plugin: "jacoco" apply plugin: "idea" +kotlin { + jvmToolchain(17) +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + idea { project { languageLevel = "17" @@ -26,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,20 +56,27 @@ dependencies { 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.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() { @@ -78,6 +90,9 @@ task createVersion() { processResources.dependsOn(createVersion) } +tasks.named("processGeneratedResources") { + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} import org.ajoberstar.grgit.Grgit createVersion { @@ -90,7 +105,7 @@ createVersion { } jacoco { - toolVersion = "0.7.6.201602180812" + toolVersion = "0.8.11" } /* vim: set ts=4 sw=4 et: */