From 0353f5a4c270e7fee5132d3ad42b42c1406361f5 Mon Sep 17 00:00:00 2001 From: RadAzzouz Date: Mon, 1 Feb 2021 14:35:23 -0500 Subject: [PATCH 1/4] Update requirements in the README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0feedbcf..59d1131b 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ To make sure this is fast, please use a work email and have someone from your co #### Requirements - The latest [Xcode](https://developer.apple.com/xcode/). -- PSPDFKit 10.1.0 for iOS or later -- react-native >= 0.63.3 -- CocoaPods >= 1.10.0 +- PSPDFKit 10.2.0 for iOS or later +- react-native >= 0.63.4 +- CocoaPods >= 1.10.1 #### Getting Started From 4db377f5ae4bb26018e2c4fcf18843865a1e2528 Mon Sep 17 00:00:00 2001 From: RadAzzouz Date: Mon, 1 Feb 2021 14:45:09 -0500 Subject: [PATCH 2/4] Update NativeCatalog README --- samples/NativeCatalog/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/NativeCatalog/README.md b/samples/NativeCatalog/README.md index c9a7337d..14e0d5a6 100644 --- a/samples/NativeCatalog/README.md +++ b/samples/NativeCatalog/README.md @@ -1,6 +1,6 @@ ## Native Catalog -This second, Android only, Catalog example serves to show you how you can leverage the `PdfView` in your own view manager to provide more advanced integrations with PSPDFKit while still using react-native where possible. +This second Catalog example serves to show you how you can leverage `PdfView` (Android) and `PSPDFViewController` (iOS) in your own view manager to provide more advanced integrations with PSPDFKit while still using React Native where possible. ### Running this Sample on Android From 5739cd5233ede391769d4f0dfff28252ab8733cc Mon Sep 17 00:00:00 2001 From: RadAzzouz Date: Mon, 1 Feb 2021 14:55:22 -0500 Subject: [PATCH 3/4] Update the Catalog and NativeCatalog Xcode projects for Xcode 12.4 --- .../ios/Catalog.xcodeproj/project.pbxproj | 10 +++--- .../xcshareddata/xcschemes/Catalog.xcscheme | 2 +- .../NativeCatalog.xcodeproj/project.pbxproj | 34 +++++-------------- .../xcschemes/NativeCatalog.xcscheme | 2 +- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj b/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj index 9daee7bc..991a61e3 100644 --- a/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj +++ b/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj @@ -667,7 +667,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = RCTPSPDF; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = "PSPDFKit GmbH"; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -1112,7 +1112,7 @@ "$(inherited)", ); INFOPLIST_FILE = CatalogTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1130,7 +1130,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = CatalogTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1154,7 +1154,7 @@ ); HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Catalog/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1181,7 +1181,7 @@ ); HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Catalog/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/Catalog/ios/Catalog.xcodeproj/xcshareddata/xcschemes/Catalog.xcscheme b/samples/Catalog/ios/Catalog.xcodeproj/xcshareddata/xcschemes/Catalog.xcscheme index e1e0ca4e..010cfbf8 100644 --- a/samples/Catalog/ios/Catalog.xcodeproj/xcshareddata/xcschemes/Catalog.xcscheme +++ b/samples/Catalog/ios/Catalog.xcodeproj/xcshareddata/xcschemes/Catalog.xcscheme @@ -1,6 +1,6 @@ /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3C8539E9E2E42A92B1663037 /* [CP] Prepare Artifacts */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-NativeCatalog/Pods-NativeCatalog-artifacts.sh", - "${PODS_ROOT}/Instant/Instant.xcframework", - "${PODS_ROOT}/PSPDFKit/PSPDFKit.xcframework", - "${PODS_ROOT}/PSPDFKit/PSPDFKitUI.xcframework", - ); - name = "[CP] Prepare Artifacts"; - outputPaths = ( - "${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NativeCatalog/Pods-NativeCatalog-artifacts.sh\"\n"; - showEnvVarsInLog = 0; - }; A55FE3DA6D56DB9652C17360 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -370,10 +349,15 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NativeCatalog/Pods-NativeCatalog-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Instant/Instant.framework/Instant", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/PSPDFKit/PSPDFKit.framework/PSPDFKit", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/PSPDFKitUI/PSPDFKitUI.framework/PSPDFKitUI", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Instant.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -484,7 +468,7 @@ "$(inherited)", ); INFOPLIST_FILE = NativeCatalogTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", @@ -505,7 +489,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = NativeCatalogTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", diff --git a/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/xcshareddata/xcschemes/NativeCatalog.xcscheme b/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/xcshareddata/xcschemes/NativeCatalog.xcscheme index 5709c20c..69e0616c 100644 --- a/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/xcshareddata/xcschemes/NativeCatalog.xcscheme +++ b/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/xcshareddata/xcschemes/NativeCatalog.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 2 Feb 2021 09:38:48 -0500 Subject: [PATCH 4/4] Bump version to 1.30.6 --- package-lock.json | 2 +- package.json | 2 +- samples/Catalog/package.json | 2 +- samples/NativeCatalog/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index efa81e8b..dcf3a58d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.30.5", + "version": "1.30.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ac47704a..4439ea09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.30.5", + "version": "1.30.6", "description": "A React Native module for the PSPDFKit library.", "keywords": [ "react native", diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json index 38ea7fda..ed5c5c1d 100644 --- a/samples/Catalog/package.json +++ b/samples/Catalog/package.json @@ -1,6 +1,6 @@ { "name": "Catalog", - "version": "1.30.5", + "version": "1.30.6", "private": true, "scripts": { "start": "react-native start", diff --git a/samples/NativeCatalog/package.json b/samples/NativeCatalog/package.json index 5c25b6e7..7414970c 100644 --- a/samples/NativeCatalog/package.json +++ b/samples/NativeCatalog/package.json @@ -1,6 +1,6 @@ { "name": "NativeCatalog", - "version": "1.30.5", + "version": "1.30.6", "private": true, "scripts": { "android": "react-native run-android",