Prepare for release

ben-manes · Mar 24, 2015 · 499f73e · 499f73e
1 parent 0874855
commit 499f73e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,7 @@ subprojects { proj ->
 
   tasks.withType(JavaCompile) {
     if (!System.env.'CI') {
-      options.incremental = true
+      options.incremental = !rootProject.hasProperty('release')
     }
   }
 

diff --git a/guava/src/test/java/com/google/common/cache/CacheEvictionTest.java b/guava/src/test/java/com/google/common/cache/CacheEvictionTest.java
@@ -119,7 +119,8 @@ public void testEviction_maxWeight_zero() {
     LoadingCache<Integer, Integer> cache = CaffeinatedGuava.build(Caffeine.newBuilder()
         .maximumWeight(0)
         .weigher(evensOnly)
-        .removalListener(removalListener),
+        .removalListener(removalListener)
+        .executor(MoreExecutors.directExecutor()),
         loader);
 
     // 1 won't be cached