From 6f6768b24a9075ea8bce41899d21ee7e75678d9f Mon Sep 17 00:00:00 2001
From: Sam Judd <judds@google.com>
Date: Sat, 24 Jan 2015 10:27:57 -0800
Subject: [PATCH] Bump OkHttp and Volley versions.

---
 gradle.properties             | 5 +++--
 integration/okhttp/okhttp.iml | 6 ++----
 integration/volley/volley.iml | 8 +-------
 samples/flickr/flickr.iml     | 3 +--
 samples/giphy/giphy.iml       | 1 -
 samples/svg/svg.iml           | 1 -
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2a4037093..f9166022c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,8 +16,9 @@ POM_DEVELOPER_EMAIL=judds@google.com
 
 SUPPORT_V4_VERSION=19.1.0
 SUPPORT_V7_VERSION=19.1.0
-VOLLEY_VERSION=1.0.7
-OK_HTTP_VERSION=2.0.0
+# TODO: Upgrade to latest version of Volley when we compile with Java 7.
+VOLLEY_VERSION=1.0.8
+OK_HTTP_VERSION=2.2.0
 ANDROID_GRADLE_VERSION=1.0.0
 
 ROBOLECTRIC_GRADLE_VERSION=0.14.0
diff --git a/integration/okhttp/okhttp.iml b/integration/okhttp/okhttp.iml
index ade91af4a..c60cfc20b 100644
--- a/integration/okhttp/okhttp.iml
+++ b/integration/okhttp/okhttp.iml
@@ -60,7 +60,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -82,13 +81,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="okio-1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.0.0" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
     <orderEntry type="module" module-name="glide" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/integration/volley/volley.iml b/integration/volley/volley.iml
index 81e370b39..a4c96ac9c 100644
--- a/integration/volley/volley.iml
+++ b/integration/volley/volley.iml
@@ -60,8 +60,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -83,10 +81,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-report" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 19 Platform" jdkType="Android SDK" />
@@ -101,9 +95,9 @@
     <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.10" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0.7" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="truth-0.24" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockito-all-1.9.5" level="project" />
diff --git a/samples/flickr/flickr.iml b/samples/flickr/flickr.iml
index 97b76da5b..6198370d6 100644
--- a/samples/flickr/flickr.iml
+++ b/samples/flickr/flickr.iml
@@ -79,14 +79,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0.7" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.10" level="project" />
     <orderEntry type="module" module-name="library" exported="" />
     <orderEntry type="module" module-name="disklrucache" exported="" />
   </component>
diff --git a/samples/giphy/giphy.iml b/samples/giphy/giphy.iml
index 5755c221c..2ae755202 100644
--- a/samples/giphy/giphy.iml
+++ b/samples/giphy/giphy.iml
@@ -79,7 +79,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 19 Platform" jdkType="Android SDK" />
diff --git a/samples/svg/svg.iml b/samples/svg/svg.iml
index 154c730d5..1302ad02a 100644
--- a/samples/svg/svg.iml
+++ b/samples/svg/svg.iml
@@ -79,7 +79,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 19 Platform" jdkType="Android SDK" />
-- 
GitLab