fix: Updating to newest CDA

Author: Mario Bodemann

core/src/main/java/com/contentful/vault/SyncRunnable.java

@@ -28,7 +28,7 @@
 import com.contentful.java.cda.CDAType;
 import com.contentful.java.cda.LocalizedResource;
 import com.contentful.java.cda.SynchronizedSpace;
-import com.squareup.okhttp.HttpUrl;
+import okhttp3.HttpUrl;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Collections;

core/src/main/java/com/contentful/vault/Vault.java

@@ -18,6 +18,9 @@
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Handler;
+import android.os.Looper;
+
 import com.contentful.java.cda.CDAClient;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -26,7 +29,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import retrofit.android.MainThreadExecutor;
 import rx.Observable;
 import rx.subjects.PublishSubject;
 import rx.subjects.SerializedSubject;
@@ -44,7 +46,12 @@ public class Vault {
   static final ExecutorService EXECUTOR_SYNC = Executors.newSingleThreadExecutor(
       new VaultThreadFactory());
 
-  static final Executor EXECUTOR_CALLBACK = new MainThreadExecutor();
+  static final Executor EXECUTOR_CALLBACK = new Executor() {
+    Handler handler = new Handler(Looper.getMainLooper());
+    @Override public void execute(Runnable command) {
+      handler.post(command);
+    }
+  };
 
   static final Map<String, CallbackBundle> CALLBACKS = new HashMap<>();
 
@@ -166,7 +173,9 @@ private static SpaceHelper createSpaceHelper(Class<?> space) {
       return (SpaceHelper) clazz.newInstance();
     } catch (ClassNotFoundException e) {
       throw new RuntimeException("Cannot find generated class for space: " + space.getName(), e);
-    } catch (IllegalAccessException | InstantiationException e) {
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException(e);
+    } catch (InstantiationException e) {
       throw new RuntimeException(e);
     }
   }

pom.xml

@@ -49,7 +49,7 @@
 
     <android.platform>17</android.platform>
     <android.version>4.1.1.4</android.version>
-    <cda.version>5.0.1</cda.version>
+    <cda.version>7.0.0</cda.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-io.version>2.4</commons-io.version>
     <commons-lang3.version>3.4</commons-lang3.version>
@@ -200,4 +200,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>