Release 2.16.0

PSPDFKit · Feb 26, 2025 · 4cbfc5c · 4cbfc5c
1 parent 85ddc55
commit 4cbfc5c
Show file tree

Hide file tree

Showing 155 changed files with 6,194 additions and 3,335 deletions.
diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-All items and source code Copyright © 2010-2024 PSPDFKit GmbH.
+All items and source code Copyright © 2010-2025 PSPDFKit GmbH.
 
 The Nutrient SDK is a commercial product and requires a license to be used.
 

diff --git a/README.md b/README.md
@@ -114,7 +114,7 @@ See our [Getting Started on React Native guide](https://www.nutrient.io/getting-
     ...
       android {
     -  compileSdkVersion rootProject.ext.compileSdkVersion
-    +  compileSdkVersion 34
+    +  compileSdkVersion 35
     ...
       defaultConfig {
         applicationId "com.pspdfkitdemo"
@@ -139,7 +139,7 @@ See our [Getting Started on React Native guide](https://www.nutrient.io/getting-
     ```diff
     ...
     - platform :ios, min_ios_version_supported
-    + platform :ios, '15.0'
+    + platform :ios, '16.0'
     ...
     ```
 
@@ -161,7 +161,7 @@ See our [Getting Started on React Native guide](https://www.nutrient.io/getting-
    open PSPDFKitDemo.xcworkspace
    ```
 
-1. Make sure the deployment target is set to 15.0 or higher:
+1. Make sure the deployment target is set to 16.0 or higher:
 
    ![deployment-target](./screenshots/deployment-target.png)
 
@@ -268,6 +268,6 @@ For Troubleshooting common issues you might encounter when setting up the Nutrie
 ## License
 
 This project can be used for evaluation or if you have a valid Nutrient license.
-All items and source code Copyright © 2010-2024 PSPDFKit GmbH.
+All items and source code Copyright © 2010-2025 PSPDFKit GmbH.
 
 See [LICENSE](./LICENSE) for details.
diff --git a/android/.classpath b/android/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Users/erhardbrand/Library/Java/JavaVirtualMachines/jdk-17.0.8.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

diff --git a/android/build.gradle b/android/build.gradle
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2024 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2025 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
@@ -15,45 +15,66 @@
  *   Contains gradle configuration constants
  */
 ext {
-    PSPDFKIT_VERSION = '2024.8.1'
+    PSPDFKIT_VERSION = '10.0.1'
 }
 
 buildscript {
-    ext.kotlin_version = '1.9.24'
+    ext.kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.kotlinVersion :
+            rootProject.ext.has('kotlin_version') ? rootProject.ext.kotlin_version :
+                    '1.9.24'
+
+    ext.getComposeVersion = { kotlin_version ->
+        switch (kotlin_version) {
+            case ~/2\..*/: 
+                // For Kotlin 2.x+, compose compiler is handled by the plugin
+                return null
+            case '1.9.25': return '1.5.15'
+            case '1.9.24': return '1.5.14'
+            default: return '1.5.14'
+        }
+    }
 
     repositories {
         mavenCentral()
+        google()
         maven {
             url 'https://maven.google.com'
         }
         maven {
-            url 'https://customers.pspdfkit.com/maven/'
+            url 'https://my.nutrient.io/maven/'
         }
     }
 
     dependencies {
         classpath("com.android.tools.build:gradle:8.5.0")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        // Add Compose compiler plugin for Kotlin 2.0+
+        if (kotlin_version.startsWith('2')) {
+            classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
+        }
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+// Add Compose compiler plugin for Kotlin 2.0+
+if (kotlin_version.startsWith('2')) {
+    apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+}
 
 android {
     compileSdkVersion 34
-    buildToolsVersion "34.0.0"
 
     namespace "com.pspdfkit.react"
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"
     }
 
-     compileOptions {
+    compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
@@ -68,7 +89,11 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.5.14"
+        def composeVersion = getComposeVersion(kotlin_version)
+        if (composeVersion != null) {
+            kotlinCompilerExtensionVersion composeVersion
+        }
+        // When using Kotlin 2.0+, the kotlinCompilerExtensionVersion is handled by the plugin
     }
 
     kotlin {
@@ -77,11 +102,15 @@ android {
 }
 
 dependencies {
-    api("com.pspdfkit:pspdfkit:${PSPDFKIT_VERSION}") {
+    api("io.nutrient:nutrient:${PSPDFKIT_VERSION}") {
         exclude group: 'com.google.auto.value', module: 'auto-value'
+        exclude group: 'androidx.recyclerview', module: 'recyclerview'
     }
-    
+
     implementation "com.facebook.react:react-native:+"
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "androidx.compose.material:material:1.7.8"
+    implementation "androidx.compose.material3:material3:1.3.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
 }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
   ~
   ~   PSPDFKit
   ~
-  ~   Copyright © 2017-2024 PSPDFKit GmbH. All rights reserved.
+  ~   Copyright © 2017-2025 PSPDFKit GmbH. All rights reserved.
   ~
   ~   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
   ~   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/AnnotationConfigurationAdaptor.kt b/android/src/main/java/com/pspdfkit/react/AnnotationConfigurationAdaptor.kt
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2018-2024 PSPDFKit GmbH. All rights reserved.
+//  Copyright © 2018-2025 PSPDFKit GmbH. All rights reserved.
 //
 //  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
 //  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java b/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2024 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2025 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/MainActivity.java b/android/src/main/java/com/pspdfkit/react/MainActivity.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2024 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2025 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/MainApplication.java b/android/src/main/java/com/pspdfkit/react/MainApplication.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2024 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2025 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/NutrientNotificationCenter.kt b/android/src/main/java/com/pspdfkit/react/NutrientNotificationCenter.kt
@@ -8,6 +8,8 @@ import com.facebook.react.bridge.WritableMap
 import com.pspdfkit.PSPDFKit
 import com.pspdfkit.analytics.AnalyticsClient
 import com.pspdfkit.annotations.Annotation
+import com.pspdfkit.annotations.AnnotationType
+import com.pspdfkit.annotations.WidgetAnnotation
 import com.pspdfkit.forms.ChoiceFormElement
 import com.pspdfkit.forms.ComboBoxFormElement
 import com.pspdfkit.forms.EditableButtonFormElement
@@ -27,6 +29,7 @@ enum class NotificationEvent(val value: String) {
     DOCUMENT_LOADED("documentLoaded"),
     DOCUMENT_LOAD_FAILED("documentLoadFailed"),
     DOCUMENT_PAGE_CHANGED("documentPageChanged"),
+    DOCUMENT_SCROLLED("documentScrolled"),
     ANNOTATIONS_ADDED("annotationsAdded"),
     ANNOTATION_CHANGED("annotationChanged"),
     ANNOTATIONS_REMOVED("annotationsRemoved"),
@@ -87,6 +90,18 @@ object NutrientNotificationCenter {
         sendEvent(NotificationEvent.DOCUMENT_PAGE_CHANGED.value, jsonData)
     }
 
+    fun documentScrolled(scrollData: Map<String, Int>, documentID: String) {
+        val jsonData = Arguments.createMap()
+        val scrollDataMap = Arguments.createMap()
+        scrollData.forEach { (key, value) ->
+            scrollDataMap.putInt(key, value)
+        }
+        jsonData.putString("event", NotificationEvent.DOCUMENT_SCROLLED.value)
+        jsonData.putMap("scrollData", scrollDataMap)
+        jsonData.putString("documentID", documentID)
+        sendEvent(NotificationEvent.DOCUMENT_SCROLLED.value, jsonData)
+    }
+
     fun annotationsChanged(changeType: String, annotation: Annotation, documentID: String) {
         when (changeType) {
             "changed" -> {
@@ -95,6 +110,10 @@ object NutrientNotificationCenter {
                     val annotationsList = mutableListOf<Map<String, Any>>()
                     val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
                     annotationMap["uuid"] = annotation.uuid
+                    if (annotation.type == AnnotationType.WIDGET) {
+                        val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                        annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+                    }
                     annotationsList.add(annotationMap)
                     val nativeAnnotationsList = Arguments.makeNativeArray(annotationsList)
 
@@ -128,6 +147,10 @@ object NutrientNotificationCenter {
                     val annotationsList = mutableListOf<Map<String, Any>>()
                     val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
                     annotationMap["uuid"] = annotation.uuid
+                    if (annotation.type == AnnotationType.WIDGET) {
+                        val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                        annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+                    }
                     annotationsList.add(annotationMap)
                     val nativeAnnotationsList = Arguments.makeNativeArray(annotationsList)
 
@@ -149,6 +172,10 @@ object NutrientNotificationCenter {
             val annotationsList = mutableListOf<Map<String, Any>>()
             val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
             annotationMap["uuid"] = annotation.uuid
+            if (annotation.type == AnnotationType.WIDGET) {
+                val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+            }
             annotationsList.add(annotationMap)
             val nativeAnnotationsList = Arguments.makeNativeArray(annotationsList)
 
@@ -168,6 +195,10 @@ object NutrientNotificationCenter {
             val annotationsList = mutableListOf<Map<String, Any>>()
             val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
             annotationMap["uuid"] = annotation.uuid
+            if (annotation.type == AnnotationType.WIDGET) {
+                val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+            }
             annotationsList.add(annotationMap)
             val nativeAnnotationsList = Arguments.makeNativeArray(annotationsList)
 
@@ -186,6 +217,10 @@ object NutrientNotificationCenter {
             val instantJson = JSONObject(annotation.toInstantJson())
             val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
             annotationMap["uuid"] = annotation.uuid
+            if (annotation.type == AnnotationType.WIDGET) {
+                val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+            }
             val nativeAnnotationMap = Arguments.makeNativeMap(annotationMap)
 
             val pointMap = mapOf("x" to pointF.x, "y" to pointF.y)
@@ -217,6 +252,10 @@ object NutrientNotificationCenter {
             val annotationsList = mutableListOf<Map<String, Any>>()
             val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
             annotationMap["uuid"] = annotation.uuid
+            if (annotation.type == AnnotationType.WIDGET) {
+                val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+            }
 
             (formField.formElement as? TextFormElement).let { textFormElement ->
                 if (textFormElement != null) {
@@ -258,6 +297,10 @@ object NutrientNotificationCenter {
             val instantJson = JSONObject(annotation.toInstantJson())
             val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
             annotationMap["uuid"] = annotation.uuid
+            if (annotation.type == AnnotationType.WIDGET) {
+                val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+            }
 
             (formElement as? TextFormElement).let { textFormElement ->
                 if (textFormElement != null) {
@@ -297,6 +340,10 @@ object NutrientNotificationCenter {
             val instantJson = JSONObject(annotation.toInstantJson())
             val annotationMap = JsonUtilities.jsonObjectToMap(instantJson)
             annotationMap["uuid"] = annotation.uuid
+            if (annotation.type == AnnotationType.WIDGET) {
+                val widgetAnnotation : WidgetAnnotation = annotation as WidgetAnnotation
+                annotationMap["isRequired"] = widgetAnnotation.formElement?.isRequired
+            }
 
             (formElement as? TextFormElement).let { textFormElement ->
                 if (textFormElement != null) {