Part 1 of upstream merge and format

2020-07-13 22:50:59 -04:00
parent 79771e83e0
commit 3bc692ff11
576 changed files with 3979 additions and 3421 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -51,10 +51,10 @@ version = String.format("%s-%s", rootVersion, buildNumber)
 if (!project.hasProperty("gitCommitHash")) {
    apply(plugin = "org.ajoberstar.grgit")
    ext["gitCommitHash"] = try {
-        (ext["grgit"] as Grgit?)?.head()?.abbreviatedId
+        extensions.getByName<Grgit>("grgit").head()?.abbreviatedId
    } catch (e: Exception) {
        logger.warn("Error getting commit hash", e)

-        "no_git_id"
+        "no.git.id"
    }
 }