Release 3.5.1

CHANGELOG.md

@@ -1,12 +1,18 @@
 ## Newest Release
 
+### 3.5.1 - 15 Mar 2023
+- Updates iOS license initialization in the example catalog. (#38999)
+- Updates Instant web demo links. (#39018)
+- Updates for PSPDFKit 8.5.1 for Android. (#39090)
+- Updates for PSPDFKit 12.1.2 for iOS. (#39090)
+
+## Previous Releases
+
 ### 3.5.0 - 17 Jan 2023
 - Adds Instant Synchronization support. (#37675) 
 - Updates for PSPDFKit 8.5 for Android. (#38136)
 - Updates for PSPDFKit 12.0.2 for iOS. (#38136)
 
-## Previous Releases
-
 ### 3.4.1 - 18 Nov 2022
 
 - Updates for PSPDFKit 12.0 for iOS. (#37508)

android/build.gradle

@@ -56,7 +56,6 @@ android {
 dependencies {
     implementation "com.pspdfkit:$pspdfkitMavenModuleName:$pspdfkitVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation "androidx.fragment:fragment-ktx:1.3.6"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.2.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
 }

android/config.gradle

@@ -38,7 +38,7 @@ if (pspdfkitMavenUrl == null || pspdfkitMavenUrl == '') {
 
 ext.pspdfkitVersion = localProperties.getProperty('pspdfkit.version')
 if (pspdfkitVersion == null || pspdfkitVersion == '') {
-    ext.pspdfkitVersion = '8.5.0'
+    ext.pspdfkitVersion = '8.5.1'
 }
 
 ext.pspdfkitMavenModuleName = 'pspdfkit'
@@ -54,6 +54,6 @@ ext.pspdfkitFlutterVersion = pubspecYaml.version
 
 ext.androidCompileSdkVersion = 33
 ext.androidMinSdkVersion = 21
-ext.androidTargetSdkVersion = 30
-ext.androidGradlePluginVersion = '7.1.1'
-ext.kotlinVersion = "1.7.10"
+ext.androidTargetSdkVersion = 33
+ext.androidGradlePluginVersion = '7.4.2'
+ext.kotlinVersion = "1.8.0"

example/android/app/build.gradle

@@ -46,7 +46,17 @@ flutter {
 dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0'
+
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+
+    }
 }

example/android/build.gradle

@@ -8,6 +8,7 @@
  */
 buildscript {
     apply from: '../../android/config.gradle'
+
     repositories {
         google()
         mavenCentral()

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/ios/Podfile

@@ -31,8 +31,8 @@ flutter_ios_podfile_setup
 
 target "Runner" do
   flutter_install_all_ios_pods __dir__
-  pod "PSPDFKit", "~> 12.0.2"
-  pod "Instant", "~> 12.0.2"
+  pod "PSPDFKit", "~> 12.1.2"
+  pod "Instant", "~> 12.1.2"
   use_modular_headers!
 end
 

example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -229,6 +229,7 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -243,6 +244,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

example/ios/Runner/AppDelegate.m

@@ -8,12 +8,14 @@
 //
 #include "AppDelegate.h"
 #include "GeneratedPluginRegistrant.h"
+#import <PSPDFKit/PSPDFKit.h>
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [GeneratedPluginRegistrant registerWithRegistry:self];
-  // Override point for customization after application launch.
+  [PSPDFKitGlobal setLicenseKey:@"YOUR_LICENSE_KEY_GOES_HERE"];
+    // Override point for customization after application launch.
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 

example/ios/Runner/Info.plist

@@ -51,5 +51,7 @@
 	<true/>
 	<key>NSCameraUsageDescription</key>
 	<string>This app needs camera access to scan QR codes</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

example/lib/main.dart

@@ -126,19 +126,15 @@ class HomePage extends StatefulWidget {
   const HomePage({Key? key}) : super(key: key);
 
   @override
-  _HomePageState createState() => _HomePageState();
+  State<HomePage> createState() => _HomePageState();
 }
 
 class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
-  static final ThemeData lightTheme = ThemeData(
-      backgroundColor: Colors.transparent,
-      primaryColor: Colors.black,
-      dividerColor: Colors.grey[400]);
-
-  static final ThemeData darkTheme = ThemeData(
-      backgroundColor: Colors.transparent,
-      primaryColor: Colors.white,
-      dividerColor: Colors.grey[800]);
+  static final ThemeData lightTheme =
+      ThemeData(primaryColor: Colors.black, dividerColor: Colors.grey[400]);
+
+  static final ThemeData darkTheme =
+      ThemeData(primaryColor: Colors.white, dividerColor: Colors.grey[800]);
   String _frameworkVersion = '';
   ThemeData currentTheme = lightTheme;
 

example/lib/pspdfkit_instant_collaboration_example.dart

@@ -37,63 +37,71 @@ class _PspdfkitInstantCollaborationExampleState
             child: SingleChildScrollView(
               child: Column(
                 children: [
-                  if (Platform.isAndroid)
-                    RichText(
-                        text: TextSpan(
-                            text: 'Scan the QR code from  ',
-                            style: const TextStyle(color: Colors.black),
-                            children: [
-                          TextSpan(
-                            text: 'pspdfkit.com/instant/try',
-                            style: const TextStyle(color: Colors.blue),
-                            recognizer: TapGestureRecognizer()
-                              ..onTap = () {
-                                // Open the URL in the browser.
-                                launchUrl(Uri.parse(
-                                    'https://pspdfkit.com/instant/try'));
-                              },
-                          ),
-                          const TextSpan(
-                            text:
-                                ' to connect to the document shown in your browser.',
-                            style: TextStyle(color: Colors.black),
-                          )
-                        ])),
-                  if (Platform.isAndroid)
-                    SizedBox(
-                      width: double.infinity,
-                      child: ElevatedButton(
-                        onPressed: () {
-                          Navigator.push<String>(context,
-                              MaterialPageRoute<String>(builder: (context) {
-                            return const InstantBarcodeScanner();
-                          })).then(
-                              (value) => _loadDocument(scaffoldContext, value));
-                        },
-                        child: const Text('Scan QR code'),
-                      ),
+                  RichText(
+                      text: TextSpan(
+                          text: 'Scan the QR code from  ',
+                          style: const TextStyle(color: Colors.black),
+                          children: [
+                        TextSpan(
+                          text: 'https://web-examples.pspdfkit.com',
+                          style: const TextStyle(color: Colors.blue),
+                          recognizer: TapGestureRecognizer()
+                            ..onTap = () {
+                              // Open the URL in the browser.
+                              launchUrl(Uri.parse(
+                                  'https://web-examples.pspdfkit.com'));
+                            },
+                        ),
+                        const TextSpan(
+                          text: ' > Collaborate in Real-time - ',
+                          style: TextStyle(
+                              color: Colors.black, fontWeight: FontWeight.bold),
+                        ),
+                        const TextSpan(
+                          text:
+                              'to connect to the document shown in your browser.',
+                          style: TextStyle(color: Colors.black),
+                        )
+                      ])),
+                  SizedBox(
+                    width: double.infinity,
+                    child: ElevatedButton(
+                      onPressed: () {
+                        Navigator.push<String>(context,
+                            MaterialPageRoute<String>(builder: (context) {
+                          return const InstantBarcodeScanner();
+                        })).then(
+                            (value) => _loadDocument(scaffoldContext, value));
+                      },
+                      child: const Text('Scan QR code'),
                     ),
+                  ),
                   const Padding(
                     padding: EdgeInsets.all(16.0),
                   ),
                   RichText(
                       text: TextSpan(
-                          text: 'Copy the collaboration URL from  ',
+                          text: 'Copy the collaboration URL from ',
                           style: const TextStyle(color: Colors.black),
                           children: [
                         TextSpan(
-                          text: 'pspdfkit.com/instant/try',
+                          text: 'https://web-examples.pspdfkit.com',
                           style: const TextStyle(color: Colors.blue),
                           recognizer: TapGestureRecognizer()
                             ..onTap = () {
                               // Open the URL in the browser.
                               launchUrl(Uri.parse(
-                                  'https://pspdfkit.com/instant/try'));
+                                  'https://web-examples.pspdfkit.com'));
                             },
                         ),
+                        const TextSpan(
+                          text: ' > Collaborate in Real-time - ',
+                          style: TextStyle(
+                              color: Colors.black, fontWeight: FontWeight.bold),
+                        ),
                         const TextSpan(
                           text:
-                              ' to connect to the document shown in your browser.',
+                              'to connect to the document shown in your browser.',
                           style: TextStyle(color: Colors.black),
                         )
                       ])),

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: pspdfkit_example
 description: Demonstrates how to use the pspdfkit plugin.
-version: 3.5.0
+version: 3.5.1
 homepage: https://pspdfkit.com/
 environment:
   sdk: '>=2.12.0 <3.0.0'

ios/pspdfkit_flutter.podspec

@@ -5,7 +5,7 @@
 #
 Pod::Spec.new do |s|
   s.name                  = "pspdfkit_flutter"
-  s.version               = "3.5.0"
+  s.version               = "3.5.1"
   s.homepage              = "https://PSPDFKit.com"
   s.documentation_url     = "https://pspdfkit.com/guides/flutter"
   s.license               = { type: "Commercial", file: "../LICENSE" }
@@ -22,6 +22,6 @@ Pod::Spec.new do |s|
   s.dependency("Instant")
   s.swift_version         = "5.0"
   s.platform              = :ios, "14.0"
-  s.version               = "3.5.0"
+  s.version               = "3.5.1"
   s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES", "GENERATE_INFOPLIST_FILE" => "YES", "SWIFT_INSTALL_OBJC_HEADER" => "NO" }
 end

lib/src/android_permission_status.dart

@@ -6,6 +6,8 @@
 ///  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
 ///  This notice may not be removed from this file.
 ///
+// ignore_for_file: deprecated_member_use_from_same_package
+
 part of pspdfkit;
 
 /// Permission status enumeration used only by Android platform.

lib/src/main.dart

@@ -9,10 +9,10 @@
 library pspdfkit;
 
 import 'dart:async';
-import 'dart:ui';
 
 import 'dart:io' show Directory;
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
 part 'android_permission_status.dart';
@@ -204,10 +204,14 @@ class Pspdfkit {
           pdfViewControllerDidDismiss();
           break;
         default:
-          print('Unknown method ${call.method} ');
+          if (kDebugMode) {
+            print('Unknown method ${call.method} ');
+          }
       }
     } catch (e) {
-      print(e);
+      if (kDebugMode) {
+        print(e);
+      }
     }
     return Future.value();
   }

lib/src/widgets/pspdfkit_widget.dart

@@ -16,7 +16,7 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-import 'package:pspdfkit_flutter/src/widgets/pspdfkit_widget_controller.dart';
+import '../../widgets/pspdfkit_widget_controller.dart';
 
 typedef PspdfkitWidgetCreatedCallback = void Function(
     PspdfkitWidgetController view);
@@ -36,9 +36,11 @@ class PspdfkitWidget extends StatefulWidget {
       : super(key: key);
 
   @override
+  // ignore: library_private_types_in_public_api
   _PspdfkitWidgetState createState() => _PspdfkitWidgetState();
 }
 
+// ignore: deprecated_member_use_from_same_package
 class _PspdfkitWidgetState extends State<PspdfkitWidget> {
   late PspdfkitWidgetController controller;
 

lib/widgets/pspdfkit_widget.dart

@@ -15,7 +15,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-
 import 'package:pspdfkit_flutter/widgets/pspdfkit_widget_controller.dart';
 
 typedef PspdfkitWidgetCreatedCallback = void Function(
@@ -34,7 +33,9 @@ class PspdfkitWidget extends StatefulWidget {
       : super(key: key);
 
   @override
-  _PspdfkitWidgetState createState() => _PspdfkitWidgetState();
+  State<PspdfkitWidget> createState() {
+    return _PspdfkitWidgetState();
+  }
 }
 
 class _PspdfkitWidgetState extends State<PspdfkitWidget> {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: pspdfkit_flutter
 description: A Flutter plugin providing a feature-rich PDF viewing and editing experience to your users with the powerful PSPDFKit PDF SDK.
-version: 3.5.0
+version: 3.5.1
 homepage: https://pspdfkit.com/
 repository: https://github.com/PSPDFKit/pspdfkit-flutter
 issue_tracker: https://support.pspdfkit.com/hc/en-us/requests/new