diff --git a/build.gradle.kts b/build.gradle.kts index ea6b26bb8..e189f6b82 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ import org.ajoberstar.grgit.Grgit +import java.time.format.DateTimeFormatter plugins { id("com.gradle.build-scan") version "2.4.1" @@ -18,6 +19,28 @@ logger.lifecycle(""" ******************************************* """) //TODO FIX THIS WHEN I FEEL LIKE IT +var rootVersion = "1.13" +var revision: String = "" +var buildNumber = "" +var date: String = "" +ext { + val git: Grgit = Grgit.open { + dir = File(rootDir.toString() + "/.git"); + } + ext["date"] = git.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd")); + ext["revision"] = "-${git.head().abbreviatedId}"; + var parents: MutableList? = git.head().parentIds; + if (project.hasProperty("buildnumber")) { + buildNumber = project.properties["buildnumber"] as String; + } else { + var index = -2109; // Offset to match CI + while (parents != null && parents.isNotEmpty()) { + parents = git.getResolve().toCommit(parents.get(0)).getParentIds() + index++; + } + buildNumber = index.toString(); + } +} //def rootVersion = "1.13" //def revision = "" //def buildNumber = "" @@ -40,6 +63,8 @@ logger.lifecycle(""" // //version = String.format("%s.%s", rootVersion, buildNumber) +version = String.format("%s.%s", rootVersion, buildNumber) + if (!project.hasProperty("gitCommitHash")) { apply(plugin = "org.ajoberstar.grgit") ext["gitCommitHash"] = try { diff --git a/gradle.properties b/gradle.properties index 4d41d3dcb..5432e7cfb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=com.sk89q.worldedit -version=7.1.0-SNAPSHOT +#version=7.1.0-SNAPSHOT org.gradle.jvmargs=-Xmx1G diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index f84a33feb..cc7e924cf 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -59,9 +59,9 @@ sourceSets { tasks.named("processResources") { filesMatching("fawe.properties") { -// expand("version" to project.ext["internalVersion"]) -// expand("commit" to "TODO GIT") -// expand("date" to "TODO Date") + expand("version" to "$version") + expand("commit" to "${rootProject.ext["revision"]}") + expand("date" to "${rootProject.ext["date"]}") } } tasks.named("shadowJar") {