Add foojay to download JVMs, update to Gradle 8.5

EngineHub · Jan 21, 2024 · cd8bca9 · cd8bca9
1 parent 3295242
commit cd8bca9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,12 +51,12 @@ val totalReport = tasks.register<JacocoReport>("jacocoTotalReport") {
         proj.apply(plugin = "jacoco")
         proj.plugins.withId("java") {
             executionData(
-                    fileTree(proj.buildDir.absolutePath).include("**/jacoco/*.exec")
+                    fileTree(proj.layout.buildDirectory).include("**/jacoco/*.exec")
             )
             sourceSets(proj.the<JavaPluginExtension>().sourceSets["main"])
             reports {
                 xml.required.set(true)
-                xml.outputLocation.set(rootProject.buildDir.resolve("reports/jacoco/report.xml"))
+                xml.outputLocation.set(rootProject.layout.buildDirectory.file("reports/jacoco/report.xml"))
                 html.required.set(true)
             }
             dependsOn(proj.tasks.named("test"))

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "worldedit"
 
 include("worldedit-libs")

diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts
@@ -88,7 +88,7 @@ tasks.named("sourcesJar") {
 
 configure<LicenseExtension> {
     exclude {
-        it.file.startsWith(project.buildDir)
+        it.file.startsWith(project.layout.buildDirectory.get().asFile)
     }
 }
 tasks.withType<Checkstyle>().configureEach {