X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=build.gradle;h=75716e2e1ae0022c02a3d25a187a3fd7bedd37bc;hb=b3c31725b779d0287fff79728227556751f837f2;hp=e5eaff73942bb4724f642a46c061974ba9acca31;hpb=d673c44ae56fcaf8368bcf3488f417e3b947158e;p=Sone.git diff --git a/build.gradle b/build.gradle index e5eaff7..75716e2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,13 @@ +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.4.32' + id 'org.jetbrains.kotlin.plugin.noarg' version '1.4.32' id 'info.solidsoft.pitest' version '1.4.5' } group = 'net.pterodactylus' -version = '80' +version = '82' repositories { mavenCentral() @@ -22,6 +23,13 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } +tasks.withType(KotlinCompile) { + kotlinOptions { + jvmTarget = "1.8" + freeCompilerArgs += '-Xjvm-default=enable' + } +} + configurations { provided { dependencies.all { dep -> @@ -30,7 +38,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' @@ -69,6 +77,7 @@ task notParallelTest(type: Test) { useJUnit { includeCategories 'net.pterodactylus.sone.test.NotParallel' } + dependsOn parallelTest } test { @@ -77,7 +86,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') @@ -110,12 +119,6 @@ pitest { timeoutFactor = 3.0 } -apply plugin: 'findbugs' - -findbugs { - ignoreFailures = true -} - apply plugin: 'idea' task countLinesMain(type: Exec) {