From 1aa9720fa0348691b7eba0be6ae6354c42854c14 Mon Sep 17 00:00:00 2001 From: soloturn Date: Sat, 8 Jul 2023 17:35:03 +0200 Subject: [PATCH] outputdir --> destinationDirectory, prepare gradle upgrade --- build-logic/src/main/kotlin/terasology-metrics.gradle.kts | 2 +- build-logic/src/main/kotlin/terasology-module.gradle.kts | 4 ++-- engine-tests/build.gradle | 4 ++-- engine/build.gradle | 2 +- facades/TeraEd/build.gradle | 4 ++-- subsystems/build.gradle | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-logic/src/main/kotlin/terasology-metrics.gradle.kts b/build-logic/src/main/kotlin/terasology-metrics.gradle.kts index 2c57d92a194..7fa5e2e7fee 100644 --- a/build-logic/src/main/kotlin/terasology-metrics.gradle.kts +++ b/build-logic/src/main/kotlin/terasology-metrics.gradle.kts @@ -50,7 +50,7 @@ tasks.withType { // If false, the outputs are still collected and visible in the test report, but they don't spam the console. testLogging.showStandardStreams = false reports { - junitXml.isEnabled = true + junitXml.required.set(true) } jvmArgs("-Xms512m", "-Xmx1024m") diff --git a/build-logic/src/main/kotlin/terasology-module.gradle.kts b/build-logic/src/main/kotlin/terasology-module.gradle.kts index 9c48409bea9..2586ee1da43 100644 --- a/build-logic/src/main/kotlin/terasology-module.gradle.kts +++ b/build-logic/src/main/kotlin/terasology-module.gradle.kts @@ -29,10 +29,10 @@ apply(from = "$rootDir/config/gradle/publish.gradle") // Handle some logic related to where what is configure { main { - java.outputDir = buildDir.resolve("classes") + java.destinationDirectory.set(buildDir.resolve("classes")) } test { - java.outputDir = buildDir.resolve("testClasses") + java.destinationDirectory.set(buildDir.resolve("testClasses")) } } diff --git a/engine-tests/build.gradle b/engine-tests/build.gradle index cea4bf94360..e5a9c4e6127 100644 --- a/engine-tests/build.gradle +++ b/engine-tests/build.gradle @@ -45,8 +45,8 @@ println "Version for $project.name loaded as $version for group $group" sourceSets { // Adjust output path (changed with the Gradle 6 upgrade, this puts it back) - main.java.outputDir = new File("$buildDir/classes") - test.java.outputDir = new File("$buildDir/testClasses") + main.java.destinationDirectory.set(new File("$buildDir/classes")) + test.java.destinationDirectory.set(new File("$buildDir/testClasses")) } // Primary dependencies definition diff --git a/engine/build.gradle b/engine/build.gradle index 2695afd67c6..a007226ef64 100644 --- a/engine/build.gradle +++ b/engine/build.gradle @@ -45,7 +45,7 @@ sourceSets { } java { // Adjust output path (changed with the Gradle 6 upgrade, this puts it back) - outputDir = new File("$buildDir/classes") + destinationDirectory.set(new File("$buildDir/classes")) } } } diff --git a/facades/TeraEd/build.gradle b/facades/TeraEd/build.gradle index 4b1f24b7228..eb69707c570 100644 --- a/facades/TeraEd/build.gradle +++ b/facades/TeraEd/build.gradle @@ -19,8 +19,8 @@ group = 'org.terasology.facades' sourceSets { // Adjust output path (changed with the Gradle 6 upgrade, this puts it back) - main.java.outputDir = new File("$buildDir/classes") - test.java.outputDir = new File("$buildDir/testClasses") + main.java.destinationDirectory.set(new File("$buildDir/classes")) + test.java.destinationDirectory.set(new File("$buildDir/testClasses")) } dependencies { diff --git a/subsystems/build.gradle b/subsystems/build.gradle index 0e6771f98f1..21ca69e7e3a 100644 --- a/subsystems/build.gradle +++ b/subsystems/build.gradle @@ -9,7 +9,7 @@ subprojects { def sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).sourceSets - sourceSets.main.java.outputDir = new File("$buildDir/classes") + sourceSets.main.java.destinationDirectory.set(new File("$buildDir/classes")) idea { module { // Change around the output a bit