From 227e7a9cb465a3ef81f0fc8e1c5fbdaca84bd821 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 24 Jul 2022 14:22:46 +0200 Subject: [PATCH] =?utf8?q?=F0=9F=91=B7=20Update=20Gradle=20to=207.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build.gradle | 51 ++++++++++++++++++-------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 75716e2..c7e550e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { 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' + id 'info.solidsoft.pitest' version '1.7.4' + id 'jacoco' } group = 'net.pterodactylus' @@ -36,7 +37,7 @@ configurations { configurations.default.exclude group: dep.group, module: dep.name } } - compile.extendsFrom provided + implementation.extendsFrom provided } dependencies { @@ -44,23 +45,23 @@ dependencies { provided group: 'org.freenetproject', name: 'freenet-ext', version: '29' provided group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.54' - compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8' - compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.0-RC' + implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8' + implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.0-RC' - compile group: 'net.pterodactylus', name: 'utils', version: '0.13.1' - compile group: 'com.google.inject', name: 'guice', version: '4.2.2' - compile group: 'com.google.guava', name: 'guava', version: '27.0.1-jre' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.1' - compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.1' - compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - compile group: 'org.jsoup', name: 'jsoup', version: '1.10.2' - compile group: 'io.dropwizard.metrics', name: 'metrics-core', version: '4.1.0' - compile group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' + implementation group: 'net.pterodactylus', name: 'utils', version: '0.13.1' + implementation group: 'com.google.inject', name: 'guice', version: '4.2.2' + implementation group: 'com.google.guava', name: 'guava', version: '27.0.1-jre' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.1' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.1' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' + implementation group: 'org.jsoup', name: 'jsoup', version: '1.10.2' + implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '4.1.0' + implementation group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' - testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit' - testCompile group: 'junit', name: 'junit', version: '4.11' - testCompile group: 'org.mockito', name: 'mockito-core', version: '2.28.2' - testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' + testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit' + testImplementation group: 'junit', name: 'junit', version: '4.11' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4' + testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' } apply from: 'version.gradle' @@ -87,7 +88,8 @@ test { task fatJar(type: Jar) { archiveFileName = project.name.toLowerCase() + '-jar-with-dependencies.jar' - from { (configurations.runtime - configurations.provided).collect { it.isDirectory() ? it : zipTree(it) } } + from { (configurations.runtimeClasspath - configurations.provided).collect { it.isDirectory() ? it : zipTree(it) } } + setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) manifest { attributes('Plugin-Main-Class': 'net.pterodactylus.sone.main.SonePlugin') } @@ -104,16 +106,19 @@ javadoc { failOnError = false } -apply plugin: 'jacoco' - jacoco { - toolVersion = '0.8.4' + toolVersion = '0.8.8' } -jacocoTestReport.dependsOn test +jacocoTestReport { + executionData(layout.buildDirectory.getAsFileTree().matching { + include "jacoco/*.exec" + }) + dependsOn test +} pitest { - pitestVersion = '1.4.10' + pitestVersion = '1.7.4' outputFormats = ['HTML', 'XML'] timestampedReports = false timeoutFactor = 3.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1cdded7..f3195a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip -- 2.7.4