From 338e1538347f7d6792b7846181581871fc06fe93 Mon Sep 17 00:00:00 2001
From: ImUrX <urielfontan2002@gmail.com>
Date: Thu, 15 Jun 2023 16:33:07 -0300
Subject: [PATCH] keep fixing gradle script

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 server/desktop/build.gradle.kts          | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f..bdc9a83b1 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.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
diff --git a/server/desktop/build.gradle.kts b/server/desktop/build.gradle.kts
index c1b5613ac..26f3341d0 100644
--- a/server/desktop/build.gradle.kts
+++ b/server/desktop/build.gradle.kts
@@ -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")
 }