Update to GSON 2.1

harsa · Jan 11, 2012 · cce9640 · cce9640
1 parent bfc1fae
commit cce9640
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.idea/libraries/JARs.xml b/.idea/libraries/JARs.xml
diff --git a/build.xml b/build.xml
@@ -74,12 +74,12 @@
         <fileset dir="lib" includes="jarjar*.jar"/>
       </classpath>
     </taskdef>
-    <jarjar jarfile="${build.dir}/retrofit-gson-1.6.jar">
-      <zipfileset src="lib/gson-1.6.jar"/>
+    <jarjar jarfile="${build.dir}/retrofit-gson-2.1.jar">
+      <zipfileset src="lib/gson-2.1.jar"/>
       <rule pattern="com.google.gson.**" result="retrofit.internal.gson.@1"/>
     </jarjar>
-    <jarjar jarfile="${build.dir}/retrofit-gson-1.6-sources.jar">
-      <zipfileset src="lib/gson-1.6-sources.jar"/>
+    <jarjar jarfile="${build.dir}/retrofit-gson-2.1-sources.jar">
+      <zipfileset src="lib/gson-2.1-sources.jar"/>
       <rule pattern="com.google.gson.**" result="retrofit.internal.gson.@1"/>
     </jarjar>
   </target>
@@ -98,12 +98,12 @@
       <compile.main.classpath>
         <pathelement location="${build.dir}/core/main"/>
         <pathelement location="${build.dir}/io/main"/>
-	      <pathelement location="${build.dir}/retrofit-gson-1.6.jar"/>
+	      <pathelement location="${build.dir}/retrofit-gson-2.1.jar"/>
       </compile.main.classpath>
       <compile.tests.classpath>
         <pathelement location="${build.dir}/core/main"/>
         <pathelement location="${build.dir}/io/main"/>
-        <pathelement location="${build.dir}/retrofit-gson-1.6.jar"/>
+        <pathelement location="${build.dir}/retrofit-gson-2.1.jar"/>
       </compile.tests.classpath>
     </compile.module>
 

diff --git a/ivy.xml b/ivy.xml
@@ -24,7 +24,7 @@
   <!-- Note: find these at http://mvnrepository.com/ -->
   <dependencies>
     <dependency org="com.google.android" name="android-test" rev="2.2.1"/>
-    <dependency org="com.google.code.gson" name="gson" rev="1.6"/>
+    <dependency org="com.google.code.gson" name="gson" rev="2.1"/>
     <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1"/>
     <dependency org="com.google.code.guice" name="guice" rev="1.0"/>
     <dependency org="org.apache.httpcomponents" name="httpmime" rev="4.1-alpha1"/>