Merge pull request #113 from contentful/fix/update-libraries

Fix/update libraries

Author: mariobodemann

CHANGELOG.md

@@ -2,7 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## Version [1.0.1][unreleased] - (in development)
+## Version [2.0.1][unreleased] - (in development)
+- TBA
+
+## Version [2.0.0] - 2016-04-15
+- changed: update cda to 7.0.0
 
 ## Version [1.0.0] - 2016-02-29
 - NOTE: This release introduces backwards incompatible changes to any existing database schemas, when upgrading make sure to bump the `dbVersion` attribute on your `Space`.
@@ -88,7 +92,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Version 0.9.0 - 2015-05-18
 Initial release.
 
-[unreleased]: https://github.com/contentful/vault/compare/vault-parent-1.0.0...HEAD
+[unreleased]: https://github.com/contentful/vault/compare/vault-parent-2.0.0...HEAD
+[2.0.0]: https://github.com/contentful/vault/compare/vault-parent-1.0.0...vault-parent-2.0.0
 [1.0.0]: https://github.com/contentful/vault/compare/vault-parent-0.9.14...vault-parent-1.0.0
 [0.9.14]: https://github.com/contentful/vault/compare/vault-parent-0.9.13...vault-parent-0.9.14
 [0.9.13]: https://github.com/contentful/vault/compare/vault-parent-0.9.12...vault-parent-0.9.13

README.md

@@ -12,18 +12,18 @@ Grab via Maven:
 <dependency>
   <groupId>com.contentful.vault</groupId>
   <artifactId>compiler</artifactId>
-  <version>1.0.0/version>
+  <version>2.0.0/version>
 </dependency>
 <dependency>
   <groupId>com.contentful.vault</groupId>
   <artifactId>core</artifactId>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
 </dependency>
 ```
 or Gradle:
 ```groovy
-apt 'com.contentful.vault:compiler:1.0.0'
-compile 'com.contentful.vault:core:1.0.0'
+apt 'com.contentful.vault:compiler:2.0.0'
+compile 'com.contentful.vault:core:2.0.0'
 ```
 
 Note for Gradle users, make sure to use the [android-apt][apt] Gradle plugin, which lets you configure compile-time only dependencies.

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

@@ -40,7 +40,7 @@
 
   <organization>
     <name>Contentful, GmbH.</name>
-    <url>http://contentful.com.com</url>
+    <url>http://contentful.com</url>
   </organization>
 
   <properties>
@@ -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>