X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=build.gradle;h=c2247d357a119db5d29cb041831b6dcd1750978e;hp=d1bf4d994623fe48cdfd4320ceb2d2d1db8afe11;hb=69a95e89c8a306713bbe719ce23f49e7536774be;hpb=f5c68762e5a00d2cdbc433310f5160bd4c811f95

diff --git a/build.gradle b/build.gradle
index d1bf4d9..c2247d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
-    id 'org.jetbrains.kotlin.plugin.noarg' version '1.3.61'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.70'
+    id 'org.jetbrains.kotlin.plugin.noarg' version '1.3.70'
     id 'info.solidsoft.pitest' version '1.4.5'
 }
 
@@ -22,7 +23,7 @@ tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
 }
 
-compileKotlin {
+tasks.withType(KotlinCompile) {
     kotlinOptions {
         jvmTarget = "1.8"
     }
@@ -36,7 +37,7 @@ configurations {
     }
     compile.extendsFrom provided
 }
- 
+
 dependencies {
     provided group: 'org.freenetproject', name: 'fred', version: '0.7.5.1475'
     provided group: 'org.freenetproject', name: 'freenet-ext', version: '29'
@@ -75,6 +76,7 @@ task notParallelTest(type: Test) {
     useJUnit {
         includeCategories 'net.pterodactylus.sone.test.NotParallel'
     }
+    dependsOn parallelTest
 }
 
 test {
@@ -83,7 +85,7 @@ test {
 }
 
 task fatJar(type: Jar) {
-    archiveName = project.name.toLowerCase() + '-jar-with-dependencies.jar'
+    archiveFileName = project.name.toLowerCase() + '-jar-with-dependencies.jar'
     from { (configurations.runtime - configurations.provided).collect { it.isDirectory() ? it : zipTree(it) } }
     manifest {
         attributes('Plugin-Main-Class': 'net.pterodactylus.sone.main.SonePlugin')