Merge pull request #34 from iojw/guava-fix

Update build.gradle to prevent guava conflicts
MovingBlocks · Jan 23, 2017 · a12185a · a12185a
2 parents 3dab59a + a676e8a
commit a12185a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cr-core/build.gradle b/cr-core/build.gradle
@@ -48,7 +48,8 @@ dependencies {
 
     testRuntime group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7'
 
-    compile 'com.google.apis:google-api-services-drive:v2-rev193-1.20.0'
+    compile group: 'com.google.guava', name: 'guava', version: '19.0'
+    compile ('com.google.apis:google-api-services-drive:v2-rev193-1.20.0'){exclude module: 'guava-jdk5'}
     //compile 'com.google.oauth-client:google-oauth-client-java6:1.19.0'
     //compile 'com.google.oauth-client:google-oauth-client-jetty:1.19.0'
 }