From: David ‘Bombe’ Roden Date: Thu, 27 Nov 2025 10:39:46 +0000 (+0100) Subject: 💚 Update Gradle to latest 8.x version X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=0ef78649ce568e2a3f44ba588a14da3f808c462c;p=jSite.git 💚 Update Gradle to latest 8.x version --- diff --git a/build.gradle b/build.gradle index c530c78..61127d0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,39 @@ -apply plugin: 'java' +plugins { + id 'application' + id 'jacoco' +} -group = 'net.pterodactylus' -version = '0.14' +application { + group = 'net.pterodactylus' + version = '0.14' + mainClass = 'de.todesbaum.jsite.main.Main' +} repositories { - maven { url "https://maven.pterodactylus.net/" } - maven { url "https://repo.maven.apache.org/maven2" } + maven { url = "https://maven.pterodactylus.net/" } + maven { url = "https://repo.maven.apache.org/maven2" } } -dependencies { - compile group: 'net.pterodactylus', name: 'utils', version: '0.13' - - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' - testCompile group: 'org.mockito', name: 'mockito-core', version: '4.11.0' +configurations { + runtime.extendsFrom implementation } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -apply plugin: 'application' +dependencies { + implementation group: 'net.pterodactylus', name: 'utils', version: '0.13' -mainClassName = 'de.todesbaum.jsite.main.Main' + testImplementation(group: 'junit', name: 'junit', version: '4.13.2') { + exclude group: 'org.hamcrest', module: 'hamcrest-core' + } + testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '3.0' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.11.0' +} -task fatJar(type: Jar) { - archiveName = "${project.name}-${project.version}-jar-with-dependencies.jar" +tasks.register('fatJar', Jar) { + archiveFileName = "${project.name}-${project.version}-jar-with-dependencies.jar" from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) - } + } } manifest { attributes('Main-Class': 'de.todesbaum.jsite.main.Main') @@ -36,15 +41,13 @@ task fatJar(type: Jar) { with jar } -apply plugin: 'jacoco' - jacoco { - toolVersion = '0.8.10' + toolVersion = '0.8.14' } jacocoTestReport { dependsOn test reports { - xml.enabled = true + xml.required = true } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b6c25b4..1ba6196 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-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip