Caliper current version is not compatible with vogar current version

[GoogleCodeExporter]

Trying to run one of the caliper tests, I have a problems since files are moved 
and changed from interfaces to abstract classes.

What steps will reproduce the problem?
1. Try to run any tests with the current caliper version, and the versions 
don't seem to be compatible.

What is the expected output? What do you see instead?
Problems compiling the bencharmks

What version of the product are you using? On what operating system?
r289 on Linux

Please provide any additional information below.
In order to fix the problem, you need to include a new build of caliper.jar, 
gson (since it is not included in caliper) and patch the version with the 
current change:

Index: build.xml
===================================================================
--- build.xml   (revision 289)
+++ build.xml   (working copy)
@@ -14,12 +14,14 @@
     <property name="kxml2" value="lib/kxml-libcore-20110123.jar"/>
     <property name="android" value="${android.platform.dir}/android.jar"/>
     <property name="mockito" value="lib/mockito-all-1.8.5.jar"/>
+    <property name="gson" value="lib/gson-1.7.1.jar"/>

     <path id="dependencies">
         <pathelement location="${caliper}"/>
         <pathelement location="${guava}"/>
         <pathelement location="${kxml2}"/>
         <pathelement location="${android}"/>
+        <pathelement location="${gson}"/>
     </path>

     <target name="compile"
@@ -47,6 +49,7 @@
             <zipfileset src="${caliper}"/>
             <zipfileset src="${guava}"/>
             <zipfileset src="${kxml2}"/>
+            <zipfileset src="${gson}"/>
             <fileset dir="src">
                 <exclude name="**/*.java"/>
             </fileset>
Index: lib/caliper.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/vogar/monitor/HostMonitor.java
===================================================================
--- src/vogar/monitor/HostMonitor.java  (revision 289)
+++ src/vogar/monitor/HostMonitor.java  (working copy)
@@ -16,9 +16,10 @@

 package vogar.monitor;

-import com.google.caliper.InterleavedReader;
-import com.google.caliper.internal.gson.JsonElement;
-import com.google.caliper.internal.gson.JsonObject;
+import com.google.caliper.util.InterleavedReader;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
Index: src/vogar/monitor/TargetMonitor.java
===================================================================
--- src/vogar/monitor/TargetMonitor.java    (revision 289)
+++ src/vogar/monitor/TargetMonitor.java    (working copy)
@@ -16,8 +16,9 @@

 package vogar.monitor;

-import com.google.caliper.internal.gson.Gson;
-import com.google.caliper.internal.gson.JsonObject;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.ServerSocket;
Index: src/vogar/OutcomeStore.java
===================================================================
--- src/vogar/OutcomeStore.java (revision 289)
+++ src/vogar/OutcomeStore.java (working copy)
@@ -16,8 +16,10 @@

 package vogar;

-import com.google.caliper.internal.gson.stream.JsonReader;
-import com.google.caliper.internal.gson.stream.JsonWriter;
+
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
Index: src/vogar/ExpectationStore.java
===================================================================
--- src/vogar/ExpectationStore.java (revision 289)
+++ src/vogar/ExpectationStore.java (working copy)
@@ -16,10 +16,11 @@

 package vogar;

-import com.google.caliper.internal.gson.stream.JsonReader;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
+import com.google.gson.stream.JsonReader;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;

Original issue reported on code.google.com by luissi...@google.com on 16 Apr 2013 at 2:14

[GoogleCodeExporter]

what's the plan? do we need to change the libcore benchmarks to work with the 
current caliper?

Original comment by e...@google.com on 25 Apr 2013 at 6:34

[GoogleCodeExporter]

short term we were happy to stick with what we have. I know you always are more 
interested with the latest greatest caliper features, but we are fine with just 
getting the numbers we have today.

Original comment by b...@google.com on 25 Apr 2013 at 9:39

[GoogleCodeExporter]

Yeah, the new Caliper is actually quite different from the version in Vogar. 
Most importantly it turns on verbose logging from the JVM and knows how to 
parse the compilation logs. Making that work in Dalvik will take some time.

Original comment by limpbizkit on 25 Apr 2013 at 9:55