From 16055787fa9b528748e96761cd444f3f36c58e40 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Fri, 20 Mar 2015 12:03:48 -0700
Subject: [PATCH] Cache Gradle and not really Maven

Artifacts that Gradle caches from Maven Central go in
~/.gradle/caches/modules-2, not ~/.m2. We only need .m2 for the
locally-installed Netty.
---
 .travis.yml                       | 8 +++++++-
 buildscripts/make_dependencies.sh | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 058f8b0b4b..cdc3e7bf34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,10 @@ notifications:
 cache:
   directories:
     - /tmp/proto3-a2
-    - $HOME/.m2
+    - $HOME/.m2/repository/io/netty
+    - $HOME/.gradle/caches/modules-2
+    - $HOME/.gradle/wrapper
+
+before_cache:
+  - rm $HOME/.gradle/caches/modules-2/modules-2.lock
+  - find $HOME/.gradle/wrapper -not -name "*-all.zip" -delete
diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh
index 4af54b2242..afafaa8f73 100755
--- a/buildscripts/make_dependencies.sh
+++ b/buildscripts/make_dependencies.sh
@@ -21,7 +21,7 @@ fi
 # Make and install netty
 pushd lib/netty
 BUILD_NETTY=1
-NETTY_REV_FILE="$HOME/.m2/netty-ver"
+NETTY_REV_FILE="$HOME/.m2/repository/io/netty/netty-ver"
 REV="$(git rev-parse HEAD)"
 if [ -f "$NETTY_REV_FILE" ]; then
   REV_LAST="$(cat "$NETTY_REV_FILE")"