Merge pull request #172 from contentful/fix/migrate_to_rxjava3

fix: Migrate to rxjava3
contentful · Feb 1, 2023 · 379267f · 379267f
2 parents a48538e + e05f02f
commit 379267f
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 74 deletions.
diff --git a/compiler/pom.xml b/compiler/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.contentful.vault</groupId>
     <artifactId>vault-parent</artifactId>
-    <version>3.2.6-SNAPSHOT</version>
+    <version>3.2.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>compiler</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.contentful.vault</groupId>
     <artifactId>vault-parent</artifactId>
-    <version>3.2.6-SNAPSHOT</version>
+    <version>3.2.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>core</artifactId>
@@ -33,8 +33,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
+      <groupId>io.reactivex.rxjava3</groupId>
       <artifactId>rxjava</artifactId>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/core/src/main/java/com/contentful/vault/ObserveQuery.java b/core/src/main/java/com/contentful/vault/ObserveQuery.java
@@ -18,10 +18,11 @@
 
 import java.util.List;
 
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.FlowableEmitter;
-import io.reactivex.FlowableOnSubscribe;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.FlowableEmitter;
+import io.reactivex.rxjava3.core.FlowableOnSubscribe;
 
 public final class ObserveQuery<T extends Resource> extends AbsQuery<T, ObserveQuery<T>> {
   ObserveQuery(Class<T> type, Vault vault) {
@@ -45,25 +46,26 @@ public AllOnSubscribe(ObserveQuery<T> query, String locale) {
       this.locale = locale;
     }
 
-    @Override public void subscribe(FlowableEmitter<T> flowableEmitter) throws Exception {
+    @Override
+    public void subscribe(@NonNull FlowableEmitter<T> emitter) {
       try {
         FetchQuery<T> fetchQuery = query.vault().fetch(query.type());
         fetchQuery.setParams(query.params());
         List<T> items = fetchQuery.all(locale);
         for (T item : items) {
-          if (flowableEmitter.isCancelled()) {
+          if (emitter.isCancelled()) {
             return;
           }
-          flowableEmitter.onNext(item);
+          emitter.onNext(item);
         }
       } catch (Throwable t) {
-        if (!flowableEmitter.isCancelled()) {
-          flowableEmitter.onError(t);
+        if (!emitter.isCancelled()) {
+          emitter.onError(t);
         }
         return;
       }
-      if (!flowableEmitter.isCancelled()) {
-        flowableEmitter.onComplete();
+      if (!emitter.isCancelled()) {
+        emitter.onComplete();
       }
     }
   }

diff --git a/core/src/main/java/com/contentful/vault/Vault.java b/core/src/main/java/com/contentful/vault/Vault.java
@@ -21,7 +21,10 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.contentful.java.cda.CDAClient;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.Subject;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -31,11 +34,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subjects.Subject;
-
 public class Vault {
   public static final String ACTION_SYNC_COMPLETE = "com.contentful.vault.ACTION_SYNC_COMPLETE";
 

diff --git a/core/src/test/java/com/contentful/vault/ObserveTest.java b/core/src/test/java/com/contentful/vault/ObserveTest.java
diff --git a/last-module/pom.xml b/last-module/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vault-parent</artifactId>
     <groupId>com.contentful.vault</groupId>
-    <version>3.2.6-SNAPSHOT</version>
+    <version>3.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>com.contentful.vault</groupId>
   <artifactId>vault-parent</artifactId>
-  <version>3.2.6-SNAPSHOT</version>
+  <version>3.2.7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -47,7 +47,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.7</java.version>
 
-    <android.platform>19</android.platform>
+    <android.platform>30</android.platform>
     <android.version>4.1.1.4</android.version>
     <cda.version>10.1.0</cda.version>
     <commons-codec.version>1.10</commons-codec.version>
@@ -59,12 +59,12 @@
     <junit.version>4.12</junit.version>
     <okhttp.version>3.10.0</okhttp.version>
     <robolectric.version>3.8</robolectric.version>
-    <rxjava.version>2.1.1</rxjava.version>
+    <rxjava.version>3.1.6</rxjava.version>
     <truth.version>0.34</truth.version>
     <mockito.version>2.8.47</mockito.version>
 
     <!-- Build Dependencies -->
-    <build-helper.version>3.0.0</build-helper.version>
+    <build-helper.version>3.3.0</build-helper.version>
   </properties>
 
   <dependencyManagement>
@@ -82,7 +82,7 @@
       </dependency>
 
       <dependency>
-        <groupId>io.reactivex.rxjava2</groupId>
+        <groupId>io.reactivex.rxjava3</groupId>
         <artifactId>rxjava</artifactId>
         <version>${rxjava.version}</version>
       </dependency>
@@ -233,7 +233,7 @@
         <plugin>
           <groupId>com.simpligility.maven.plugins</groupId>
           <artifactId>android-maven-plugin</artifactId>
-          <version>4.5.0</version>
+          <version>4.6.0</version>
           <configuration>
             <sdk>
               <platform>${android.platform}</platform>

diff --git a/tests-integration/pom.xml b/tests-integration/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.contentful.vault</groupId>
     <artifactId>vault-parent</artifactId>
-    <version>3.2.6-SNAPSHOT</version>
+    <version>3.2.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>tests-integration</artifactId>
@@ -79,7 +79,7 @@
     </dependency>
 
     <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
+      <groupId>io.reactivex.rxjava3</groupId>
       <artifactId>rxjava</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/tests-integration/src/main/AndroidManifest.xml b/tests-integration/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionName="1.0"
     package="com.contentful.vaultintegration">
 
-  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="19"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
   <application android:label="label" />
 </manifest>
diff --git a/tests-integration/src/test/java/com/contentful/vaultintegration/ObserveTest.java b/tests-integration/src/test/java/com/contentful/vaultintegration/ObserveTest.java
@@ -23,10 +23,11 @@
 import com.contentful.vaultintegration.lib.demo.Cat$Fields;
 import com.contentful.vaultintegration.lib.demo.DemoSpace;
 import java.util.List;
+
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import org.junit.Test;
 import org.robolectric.RuntimeEnvironment;
 
-import io.reactivex.subscribers.TestSubscriber;
 
 import static com.google.common.truth.Truth.assertThat;
 

diff --git a/tests-integration/src/test/resources/AndroidManifest.xml b/tests-integration/src/test/resources/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionName="1.0"
     package="com.contentful.vaultintegration">
 
-  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="19"/>
+  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="21"/>
 
   <application android:label="label" />
 </manifest>