Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-12-04 14:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address Gradle deprecation warnings

Browse Source
This commit is contained in:
Nassim Jahnke 2024-11-17 13:45:25 +01:00
parent 07e2848e5b
commit 4a9c98aa1b
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build-logic/src/main/kotlin/extensions.kt
View File

@ -1,33 +1,23 @@
import org.gradle.api.JavaVersion
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
import java.io.ByteArrayOutputStream import org.gradle.jvm.toolchain.JavaLanguageVersion
fun Project.latestCommitHash(): String { fun Project.latestCommitHash(): String {
val byteOut = ByteArrayOutputStream() return runGitCommand(listOf("rev-parse", "--short", "HEAD"))
exec {
commandLine = listOf("git", "rev-parse", "--short", "HEAD")
standardOutput = byteOut
}
return byteOut.toString(Charsets.UTF_8.name()).trim()
} }
fun Project.latestCommitMessage(): String { fun Project.latestCommitMessage(): String {
val byteOut = ByteArrayOutputStream() return runGitCommand(listOf("log", "-1", "--pretty=%B"))
exec {
commandLine = listOf("git", "log", "-1", "--pretty=%B")
standardOutput = byteOut
}
return byteOut.toString(Charsets.UTF_8.name()).trim()
} }
fun Project.branchName(): String { fun Project.branchName(): String {
val byteOut = ByteArrayOutputStream() return runGitCommand(listOf("rev-parse", "--abbrev-ref", "HEAD"))
exec { }
commandLine = listOf("git", "rev-parse", "--abbrev-ref", "HEAD")
standardOutput = byteOut fun Project.runGitCommand(args: List<String>): String {
} return providers.exec {
return byteOut.toString(Charsets.UTF_8.name()).trim() commandLine = listOf("git") + args
}.standardOutput.asBytes.get().toString(Charsets.UTF_8).trim()
} }
fun Project.parseMinecraftSnapshotVersion(version: String): String? { fun Project.parseMinecraftSnapshotVersion(version: String): String? {
@ -40,6 +30,5 @@ fun Project.parseMinecraftSnapshotVersion(version: String): String? {
} }
fun JavaPluginExtension.javaTarget(version: Int) { fun JavaPluginExtension.javaTarget(version: Int) {
sourceCompatibility = JavaVersion.toVersion(version) toolchain.languageVersion.set(JavaLanguageVersion.of(version))
targetCompatibility = JavaVersion.toVersion(version)
} }

4
build.gradle.kts
View File

@ -16,10 +16,10 @@ val main = setOf(
projects.viabackwardsVelocity, projects.viabackwardsVelocity,
projects.viabackwardsSponge, projects.viabackwardsSponge,
projects.viabackwardsFabric projects.viabackwardsFabric
).map { it.dependencyProject } ).map { it.path }
subprojects { subprojects {
when (this) { when (path) {
in main -> plugins.apply("vb.shadow-conventions") in main -> plugins.apply("vb.shadow-conventions")
else -> plugins.apply("vb.base-conventions") else -> plugins.apply("vb.base-conventions")
} }