From 8f06f3878fe450bce19c448d48591d77255f2aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1zaro=20Clapp?= Date: Fri, 5 Apr 2019 12:48:54 -0400 Subject: [PATCH] Install GJF hook using a gradle task, rather than a gradlew hack. (#298) Fixes #297 --- build.gradle | 14 ++++++++++++++ config/hooks/install-pre-commit | 10 ---------- gradlew | 3 --- 3 files changed, 14 insertions(+), 13 deletions(-) delete mode 100755 config/hooks/install-pre-commit diff --git a/build.gradle b/build.gradle index f1442e84d3..fed2cfaa62 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,7 @@ subprojects { project -> errorproneJavac deps.build.errorProneJavac } project.tasks.withType(JavaCompile) { + dependsOn(installGitHooks) options.compilerArgs += [ "-Xlint:unchecked", "-Xlint:rawtypes", @@ -71,3 +72,16 @@ subprojects { project -> googleJavaFormat { toolVersion = "1.6" } + +//////////////////////////////////////////////////////////////////////// +// +// Google Java Format pre-commit hook installation +// + +tasks.register('installGitHooks', Copy) { + from(file('config/hooks/pre-commit-stub')) { + rename 'pre-commit-stub', 'pre-commit' + } + into file('.git/hooks') + fileMode 0777 +} diff --git a/config/hooks/install-pre-commit b/config/hooks/install-pre-commit deleted file mode 100755 index 9979583f97..0000000000 --- a/config/hooks/install-pre-commit +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [ ! -f .git/hooks/pre-commit ]; then - echo "Installing pre-commit hook" - cp config/hooks/pre-commit-stub .git/hooks/pre-commit - chmod +x .git/hooks/pre-commit -fi - diff --git a/gradlew b/gradlew index 78bc29e5e7..cccdd3d517 100755 --- a/gradlew +++ b/gradlew @@ -1,8 +1,5 @@ #!/usr/bin/env sh -# added manually -./config/hooks/install-pre-commit - ############################################################################## ## ## Gradle start up script for UN*X