diff --git a/build.gradle b/build.gradle index 2526ebf0d..7dcfc72c8 100644 --- a/build.gradle +++ b/build.gradle @@ -52,41 +52,32 @@ idea { // ----------------------------------------------------- // Publishing -def latestCommitHash() { - def byteOut = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', '--short', 'HEAD' - standardOutput = byteOut - } - return byteOut.toString('UTF-8').trim() +Provider latestCommitHash() { + return providers.exec { + commandLine = ["git", "rev-parse", "--short", "HEAD"] + }.standardOutput.getAsText().map(String::trim) } -def latestCommitMessage() { - def byteOut = new ByteArrayOutputStream() - exec { - commandLine 'git', 'log', '-1', '--pretty=%B' - standardOutput = byteOut - } - return byteOut.toString('UTF-8').trim() +Provider latestCommitMessage() { + return providers.exec { + commandLine = ["git", "log", "-1", "--pretty=%B"] + }.standardOutput.getAsText().map(String::trim) } -def branchName() { - def byteOut = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', '--abbrev-ref', 'HEAD' - standardOutput = byteOut - } - return byteOut.toString('UTF-8').trim() +Provider branchName() { + return providers.exec { + commandLine = ["git", "rev-parse", "--abbrev-ref", "HEAD"] + }.standardOutput.getAsText().map(String::trim) } -def branch = branchName() +def branch = branchName().get() def baseVersion = project.maven_version def isRelease = !baseVersion.contains('-') def isMainBranch = branch == "master" if (!isRelease || isMainBranch) { // Only publish releases from the main branch def suffixedVersion = isRelease ? baseVersion : baseVersion + "+" + System.getenv("GITHUB_RUN_NUMBER") - def commitHash = latestCommitHash() - def changelogContent = "[${commitHash}](https://github.com/ViaVersion/ViaRewind/commit/${commitHash}) ${latestCommitMessage()}" + def commitHash = latestCommitHash().get() + def changelogContent = "[${commitHash}](https://github.com/ViaVersion/ViaRewind/commit/${commitHash}) ${latestCommitMessage().get()}" modrinth { def mcVersions = project.mcVersions .split(',') diff --git a/common/build.gradle b/common/build.gradle index 2a0fb1ac9..2a845dccf 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -13,7 +13,7 @@ sourceSets { main { classTokenReplacer { property("\${version}", rootProject.maven_version) - property("\${impl_version}", "git-ViaRewind-${rootProject.maven_version}:${rootProject.latestCommitHash()}") + property("\${impl_version}", "git-ViaRewind-${rootProject.maven_version}:${rootProject.latestCommitHash().get()}") } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb602ee2a..82dd18b20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME