Fix various issues with raven.

- Upgrade to the latest version, fix compilation errors.
- Include the raven build properties file so it knows its version
- Set up a factory when we initialise the Error Manager
  (in debug builds this works because of a SPI entry in the raven jar)
- Bundle more bits of guava used by raven

Change-Id: I3c858936b62e4a089b19b358a5d8930c1fc54b04
Reviewed-on: http://gerrit.dmdirc.com/3119
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

build.xml

@@ -70,8 +70,7 @@
     <target name="-bundle-raven">
         <jar destfile="${dist.jar}" update="true">
             <zipfileset src="lib/main/jackson-core.jar" includes="com/fasterxml/**"/>
-            <zipfileset src="lib/main/commons-codec.jar" includes="org/apache/**"/>
-            <zipfileset src="lib/main/raven.jar" includes="net/kencochrane/**"/>
+            <zipfileset src="lib/main/raven.jar" includes="net/kencochrane/**,raven-build.properties"/>
         </jar>
     </target>
 
@@ -89,7 +88,12 @@
             -dontnote
 
             -keep public class com.google.common.eventbus.* { *; }
+            -keep public class com.google.common.base.Charsets { *; }
+            -keep public class com.google.common.base.Joiner { *; }
             -keep public class com.google.common.base.Preconditions { *; }
+            -keep public class com.google.common.base.Splitter { *; }
+            -keep public class com.google.common.collect.Iterables { *; }
+            -keep public class com.google.common.io.BaseEncoding { *; }
       </proguard>
 
       <jar destfile="${dist.jar}" update="true">

ivy.xml

@@ -25,7 +25,7 @@
 
         <dependency org="net.miginfocom" name="base64" rev="2.2" conf="main->default" />
 
-        <dependency org="net.kencochrane.raven" name="raven" rev="4.0" conf="main->default" />
+        <dependency org="net.kencochrane.raven" name="raven" rev="4.+" conf="main->default" />
 
         <dependency org="com.google.guava" name="guava" rev="15.+" conf="main->default" />
 

src/com/dmdirc/logger/ErrorManager.java

@@ -37,6 +37,9 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
 
+import net.kencochrane.raven.DefaultRavenFactory;
+import net.kencochrane.raven.RavenFactory;
+
 /**
  * Error manager.
  */
@@ -86,6 +89,8 @@ public class ErrorManager implements ConfigChangeListener {
      * @param controller The controller to use to read/write settings.
      */
     public void initialise(final IdentityController controller) {
+        RavenFactory.registerFactory(new DefaultRavenFactory());
+
         final AggregateConfigProvider config = controller.getGlobalConfiguration();
 
         config.addChangeListener("general", "logerrors", this);

src/com/dmdirc/logger/ProgramError.java

@@ -48,9 +48,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.annotation.Nullable;
 
-import net.kencochrane.raven.Dsn;
 import net.kencochrane.raven.Raven;
 import net.kencochrane.raven.RavenFactory;
+import net.kencochrane.raven.dsn.Dsn;
 import net.kencochrane.raven.event.Event;
 import net.kencochrane.raven.event.EventBuilder;
 import net.kencochrane.raven.event.interfaces.ExceptionInterface;