From 52a62b984ba5ce29c14bd0a90e9fb78ef4db553b Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Sat, 13 Jul 2019 22:16:16 -0700 Subject: [PATCH] Improve logging, update to 5.5.1 --- build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7088d0893..07b943531 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ import org.ajoberstar.grgit.Grgit -println(""" +logger.lifecycle(""" ******************************************* You are building WorldEdit! @@ -19,9 +19,9 @@ applyRootArtifactoryConfig() if (!project.hasProperty("gitCommitHash")) { apply(plugin = "org.ajoberstar.grgit") ext["gitCommitHash"] = try { - (ext["grgit"] as Grgit).head().abbreviatedId + (ext["grgit"] as Grgit?)?.head()?.abbreviatedId } catch (e: Exception) { - println("Error getting commit hash: " + e.message) + logger.warn("Error getting commit hash", e) "no_git_id" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0c4de36d..430dfabc5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists