From e370675eff1e4b3fba522c826fbd4e5ab2e10d80 Mon Sep 17 00:00:00 2001 From: Simone Arpe Date: Fri, 23 Jul 2021 17:27:19 +0200 Subject: [PATCH] Upgrade to PSPDFKit 7 for Android (#412) * Change PSPDFKIT_VERSION to Android 7 * Update build.gradle * Update build.gradle * Update build.gradle * Update the run command for the iOS Catalog * Bump version number to 1.32.0 Co-authored-by: Rad Azzouz --- android/build.gradle | 4 ++-- package-lock.json | 2 +- package.json | 2 +- samples/Catalog/README.md | 2 +- samples/Catalog/android/app/build.gradle | 4 ++-- samples/Catalog/package.json | 2 +- samples/Catalog/yarn.lock | 2 +- samples/NativeCatalog/android/build.gradle | 2 +- samples/NativeCatalog/package.json | 2 +- samples/NativeCatalog/yarn.lock | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 346bfa88..1a634354 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -15,7 +15,7 @@ * Contains gradle configuration constants */ ext { - PSPDFKIT_VERSION = '6.6.2' + PSPDFKIT_VERSION = '7.0.0' } buildscript { @@ -41,7 +41,7 @@ android { buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 26 versionCode 1 versionName "1.0" diff --git a/package-lock.json b/package-lock.json index c2703595..b772de5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.31.6", + "version": "1.32.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e3cd78d9..c46f06f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.31.6", + "version": "1.32.0", "description": "A React Native module for the PSPDFKit library.", "keywords": [ "react native", diff --git a/samples/Catalog/README.md b/samples/Catalog/README.md index 6709002c..119e1702 100644 --- a/samples/Catalog/README.md +++ b/samples/Catalog/README.md @@ -38,7 +38,7 @@ The project contains a large set of sample code, which illustrates how to set up 6. Step into the Catalog project's directory: `cd /samples/Catalog` 7. Install dependencies: `yarn install` in `samples/Catalog` directory. (Because of a [bug](https://github.com/yarnpkg/yarn/issues/2165) you may need to clean `yarn`'s cache with `yarn cache clean` before.) 8. Start the Metro bundler by running `react-native start` -9. Run the app with `react-native-cli`: `react-native run-ios` +9. Run the app with `react-native-cli`: `react-native run-ios --simulator="iPad Pro (12.9-inch) (5th generation)"` ### Troubleshooting diff --git a/samples/Catalog/android/app/build.gradle b/samples/Catalog/android/app/build.gradle index 4b5f64d5..d8259ebc 100644 --- a/samples/Catalog/android/app/build.gradle +++ b/samples/Catalog/android/app/build.gradle @@ -117,7 +117,7 @@ android { defaultConfig { applicationId "com.pspdfkit.react.catalog" multiDexEnabled true - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 26 versionCode 1 versionName "1.0" @@ -233,4 +233,4 @@ tasks.whenTaskAdded { task -> } } -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) \ No newline at end of file +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json index e9d1543c..003220a0 100644 --- a/samples/Catalog/package.json +++ b/samples/Catalog/package.json @@ -1,6 +1,6 @@ { "name": "Catalog", - "version": "1.31.6", + "version": "1.32.0", "private": true, "scripts": { "start": "react-native start", diff --git a/samples/Catalog/yarn.lock b/samples/Catalog/yarn.lock index 3dfde042..ade54115 100644 --- a/samples/Catalog/yarn.lock +++ b/samples/Catalog/yarn.lock @@ -5415,7 +5415,7 @@ react-native-permissions@^1.1.1: integrity sha512-t0Ujm177bagjUOSzhpmkSz+LqFW04HnY9TeZFavDCmV521fQvFz82aD+POXqWsAdsJVOK3umJYBNNqCjC3g0hQ== "react-native-pspdfkit@file:../..": - version "1.31.6" + version "1.32.0" react-native-qrcode-scanner@^1.2.1: version "1.2.1" diff --git a/samples/NativeCatalog/android/build.gradle b/samples/NativeCatalog/android/build.gradle index dcc215fa..42aaf2ce 100644 --- a/samples/NativeCatalog/android/build.gradle +++ b/samples/NativeCatalog/android/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { buildToolsVersion = "28.0.3" - minSdkVersion = 19 + minSdkVersion = 21 compileSdkVersion = 28 targetSdkVersion = 28 } diff --git a/samples/NativeCatalog/package.json b/samples/NativeCatalog/package.json index 3404efa8..ecad58dc 100644 --- a/samples/NativeCatalog/package.json +++ b/samples/NativeCatalog/package.json @@ -1,6 +1,6 @@ { "name": "NativeCatalog", - "version": "1.31.6", + "version": "1.32.0", "private": true, "scripts": { "android": "react-native run-android", diff --git a/samples/NativeCatalog/yarn.lock b/samples/NativeCatalog/yarn.lock index 7e8a805f..9e3c9d63 100644 --- a/samples/NativeCatalog/yarn.lock +++ b/samples/NativeCatalog/yarn.lock @@ -5506,7 +5506,7 @@ react-native-gesture-handler@^1.3.0: prop-types "^15.7.2" "react-native-pspdfkit@file:../..": - version "1.31.6" + version "1.32.0" react-native-safe-area-view@^0.14.1: version "0.14.8"