mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-04-06 02:01:58 +02:00
keep fixing gradle script
This commit is contained in:
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user