diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt index 83606e51d..4b761e1e2 100644 --- a/buildSrc/src/main/kotlin/Utils.kt +++ b/buildSrc/src/main/kotlin/Utils.kt @@ -2,26 +2,20 @@ import java.io.ByteArrayOutputStream import org.gradle.api.Action import org.gradle.api.Project import org.gradle.kotlin.dsl.support.serviceOf -import org.gradle.process.ExecOperations var isPrerelease = false fun Project.getGitHash(): String { - val stdout = ByteArrayOutputStream() - serviceOf().exec { + return providers.exec { commandLine = mutableListOf("git", "rev-parse", "--short", "HEAD") - standardOutput = stdout - } - return stdout.toString().trim() + }.standardOutput.asText.get().trim() } fun Project.gitClone(name: String) { - val stdout = ByteArrayOutputStream() - serviceOf().exec { + providers.exec { commandLine = mutableListOf("git", "clone", name) - standardOutput = stdout } } diff --git a/platforms/minestom/build.gradle.kts b/platforms/minestom/build.gradle.kts index c34763a7a..d3924c991 100644 --- a/platforms/minestom/build.gradle.kts +++ b/platforms/minestom/build.gradle.kts @@ -11,5 +11,5 @@ tasks.named("jar") { } tasks.withType().configureEach { - options.release.set(25) + options.release = 25 } \ No newline at end of file diff --git a/platforms/minestom/example/build.gradle.kts b/platforms/minestom/example/build.gradle.kts index 82fc81b00..8c465b7c9 100644 --- a/platforms/minestom/example/build.gradle.kts +++ b/platforms/minestom/example/build.gradle.kts @@ -21,7 +21,7 @@ tasks.withType { } tasks.withType().configureEach { - options.release.set(25) + options.release = 25 } application {