keep fixing gradle script

This commit is contained in:
ImUrX
2023-06-15 16:33:07 -03:00
parent 544efb6efe
commit 338e153834
2 changed files with 9 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -98,21 +98,17 @@ buildConfig {
useKotlinOutput { topLevelConstants = true }
packageName("dev.slimevr.desktop")
val gitVersionTag = grgit.describe(
mapOf(
"tags" to true,
"abbrev" to 0
)
)
val latestCommitTag =
grgit.tag.list().find { it.name == gitVersionTag }!!.commit.abbreviatedId == grgit.head().abbreviatedId
val gitLatestVersionTag = if (latestCommitTag) { gitVersionTag } else { "" }
val gitVersionTag = providers.exec {
commandLine("git", "--no-pager", "tag", "--points-at", "HEAD")
}.standardOutput.asText.get()
buildConfigField("String", "GIT_COMMIT_HASH", "\"${grgit.head().abbreviatedId}\"")
buildConfigField("String", "GIT_VERSION_TAG", "\"${gitLatestVersionTag}\"")
buildConfigField("String", "GIT_VERSION_TAG", "\"${gitVersionTag}\"")
buildConfigField("boolean", "GIT_CLEAN", grgit.status().isClean.toString())
}
tasks.getByName("run", JavaExec::class) {
standardInput = System.`in`
tasks.run<JavaExec> {
standardInput = System.`in` // this is not working
args = listOf("run")
}