From 0115e18ff107dfeb24fa67d7b548c191c3aa8b72 Mon Sep 17 00:00:00 2001
From: Lazaro Clapp <lazaro@uber.com>
Date: Fri, 5 Apr 2019 11:48:28 -0400
Subject: [PATCH 1/3] Install GJF hook using a gradle task, rather than a
 gradlew hack.

---
 build.gradle                    | 13 +++++++++++++
 config/hooks/install-pre-commit | 10 ----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100755 config/hooks/install-pre-commit

diff --git a/build.gradle b/build.gradle
index f1442e84d3..75647c63e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,3 +71,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
-

From 6f4c2465f867de0adcbc83fec6fbcad9ebf9055e Mon Sep 17 00:00:00 2001
From: Lazaro Clapp <lazaro@uber.com>
Date: Fri, 5 Apr 2019 11:52:16 -0400
Subject: [PATCH 2/3] Delete gradlew line

---
 gradlew | 3 ---
 1 file changed, 3 deletions(-)

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

From 1e8075b68719243265f971c7e3db76a1fc1d6789 Mon Sep 17 00:00:00 2001
From: Lazaro Clapp <lazaro@uber.com>
Date: Fri, 5 Apr 2019 11:59:44 -0400
Subject: [PATCH 3/3] Ensure installGitHooks is called.

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 75647c63e0..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",