Release 2.5.2

CHANGELOG.md

@@ -1,11 +1,14 @@
 ## Newest Release
 
+### 2.5.2 - 13 Apr 2023
+- Fixes missing RXJava dependencies for Android. (#39813)
+
+## Previous Releases
+
 ### 2.5.1 - 03 Apr 2023
 - Updated NativeCatalog configuration and replaced deprecated AppDelegate.m
 - Bumps PSPDFKit for Android version to 8.6.0
 
-## Previous Releases
-
 ### 2.5.0 - 23 Mar 2023
 - Added magic ink tool for Android annotation toolbar configuration. (#39174)
 - Upgrades React Native dependencies and project configuration to 0.71.2

android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java

@@ -40,11 +40,11 @@
 
 import javax.annotation.Nullable;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Exposes {@link PdfView} to react-native.

android/src/main/java/com/pspdfkit/react/ToolbarMenuItemsAdapter.java

@@ -17,7 +17,7 @@
 import com.pspdfkit.configuration.activity.PdfActivityConfiguration;
 import com.pspdfkit.configuration.sharing.ShareFeatures;
 
-import io.reactivex.annotations.NonNull;
+import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
  * This class is used for mapping the toolbar menu items for customization.

android/src/main/java/com/pspdfkit/views/PdfView.java

@@ -80,17 +80,18 @@
 import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;
 
-import io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
 
 import static com.pspdfkit.react.helper.ConversionHelpers.getAnnotationTypeFromString;
 
@@ -625,13 +626,13 @@ public Single<JSONObject> getAllUnsavedAnnotations() {
         return DocumentJsonFormatter.exportDocumentJsonAsync(document, outputStream)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
-            .toSingle(new Callable<JSONObject>() {
-                @Override
-                public JSONObject call() throws Exception {
-                    final String jsonString = outputStream.toString();
-                    return new JSONObject(jsonString);
-                }
-            });
+            .toSingle(() -> {
+                    try {
+                        return new JSONObject(outputStream.toString());
+                    } catch (JSONException e) {
+                        throw new RuntimeException(e);
+                    }
+                });
     }
 
     public Disposable addAnnotations(final int requestId, ReadableMap annotation) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "React Native PDF Library by PSPDFKit",
   "keywords": [
     "react native",

samples/Catalog/android/app/build.gradle

@@ -168,7 +168,7 @@ dependencies {
         implementation jscFlavor
     }
 
-    implementation 'com.pspdfkit:pspdfkit:8.5.0'
+    implementation 'com.pspdfkit:pspdfkit:8.6.0'
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

samples/Catalog/android/build.gradle

@@ -22,7 +22,6 @@ buildscript {
         classpath("com.android.tools.build:gradle:7.3.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

samples/Catalog/ios/Podfile.lock

@@ -339,7 +339,7 @@ PODS:
     - React
   - react-native-safe-area (0.5.1):
     - React
-  - react-native-safe-area-context (4.5.0):
+  - react-native-safe-area-context (4.5.1):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -655,7 +655,7 @@ SPEC CHECKSUMS:
   React-logger: 9332c3e7b4ef007a0211c0a9868253aac3e1da82
   react-native-pspdfkit: 421c7cf8e2dc4c6c8561d96e270a8284d7b6976e
   react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
-  react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
+  react-native-safe-area-context: f5549f36508b1b7497434baa0cd97d7e470920d4
   React-perflogger: 43392072a5b867a504e2b4857606f8fc5a403d7f
   React-RCTActionSheet: c7b67c125bebeda9fb19fc7b200d85cb9d6899c4
   React-RCTAnimation: c2de79906f607986633a7114bee44854e4c7e2f5
@@ -679,4 +679,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2834fbb617f7389284a8f6a255f6276069f9ea59
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.11.3

samples/Catalog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catalog",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "private": true,
   "scripts": {
     "android": "npx react-native run-android",
@@ -9,8 +9,8 @@
     "start": "react-native start",
     "test": "jest",
     "refresh": "yarn upgrade react-native-pspdfkit",
-    "postinstall": "rm -rf ./node_modules/react-native-pspdfkit/samples/*/node_modules && cd ios/ && pod install --repo-update",
-    "preinstall":  "rm -rf ./node_modules && rm -rf yarn.lock && rm -rf ios/Pods && rm -rf ios/Podfile.lock",
+    "postinstall": "rm -rf ./node_modules/react-native-pspdfkit/samples/*/node_modules",
+    "preinstall":  "rm -rf ./node_modules && rm -rf ios/Pods",
     "pods": "cd ios; pod install --repo-update"
   },
   "dependencies": {
@@ -71,5 +71,9 @@
     "testPathIgnorePatterns": [
       "legacy_tests"
     ]
+  },
+  "resolutions": {
+    "react-native-gesture-handler": "2.9.0"
   }
+
 }