diff options
| author | Krakenied <krakenied1@gmail.com> | 2025-02-05 19:53:13 +0100 |
|---|---|---|
| committer | Krakenied <46192742+Krakenied@users.noreply.github.com> | 2025-05-13 20:34:15 +0200 |
| commit | 5baec503aa1feb4894c12c145bdbbdf456e1e6b0 (patch) | |
| tree | cdf86f49d84ae23e55e361bc9f59d7a8ca200feb | |
| parent | 9eb99b8542623ad5d80e94f96c2c7eed6b6c39cd (diff) | |
Update Gradle Wrapper to 8.12.1
Update jvmdg to 1.2.2
| -rw-r--r-- | build.gradle.kts | 11 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rwxr-xr-x | gradlew | 3 | ||||
| -rw-r--r-- | settings.gradle.kts | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index c955648b..f167729f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,15 +64,14 @@ tasks.register<Jar>("allJar") { } fun gitCommitHash(): String { - val outputStream = ByteArrayOutputStream() - - project.exec { + val execOutput = providers.exec { commandLine = "git rev-parse --verify --short HEAD".split(" ") - standardOutput = outputStream } - val gitCommitHashBytes = outputStream.toByteArray() - return String(gitCommitHashBytes).trim() + val gitCommitHashProvider = execOutput.standardOutput.asText + val gitCommitHashString = gitCommitHashProvider.getOrElse("unknown") + + return gitCommitHashString.trim() } val javaVersions = listOf( diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..e18bc253 100644 --- 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/settings.gradle.kts b/settings.gradle.kts index f69d5530..bd54bc27 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" id("io.github.goooler.shadow") version "8.1.8" - id("xyz.wagyourtail.jvmdowngrader") version "1.2.1" + id("xyz.wagyourtail.jvmdowngrader") version "1.2.2" } } |