diff --git a/README.md b/README.md index 6fdcaa6f..6355d58d 100644 --- a/README.md +++ b/README.md @@ -37,25 +37,25 @@ To make sure this is fast, please use a work email and have someone from your co #### Requirements -- Xcode 11.3.1 -- PSPDFKit 9.2.0 for iOS or later -- react-native >= 0.61.5 -- CocoaPods >= 1.8.4 +- Xcode 11.5 +- PSPDFKit 9.4.0 for iOS or later +- react-native >= 0.62.2 +- CocoaPods >= 1.9.3 #### Getting Started Let's create a simple app that integrates PSPDFKit and uses the `react-native-pspdfkit` module. 1. Make sure `react-native-cli` is installed: `yarn global add react-native-cli` -2. Create the app with `react-native init YourApp`. +2. Create the app with `react-native init YourApp` 3. Step into your newly created app folder: `cd YourApp` 4. Install `react-native-pspdfkit` from GitHub: `yarn add github:PSPDFKit/react-native` 5. Install all the dependencies for the project: `yarn install`. (Because of a [bug](https://github.com/yarnpkg/yarn/issues/2165) you may need to clean `yarn`'s cache with `yarn cache clean` before.) -6. Open `ios/Podile` in a text editor: `open ios/Podfile`, update the platform to iOS 11, and add your CocoaPods URL. +6. Open `ios/Podile` in a text editor: `open ios/Podfile`, update the platform to iOS 12, and add the PSPDFKit podspecs: ```diff - platform :ios, '9.0' -+ platform :ios, '11.0' ++ platform :ios, '12.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' target 'YourApp' do @@ -85,8 +85,8 @@ target 'YourApp' do pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' -+ pod 'react-native-pspdfkit', :path => '../node_modules/react-native-pspdfkit' -+ pod 'PSPDFKit', podspec: 'https://customers.pspdfkit.com/cocoapods/YOUR_COCOAPODS_KEY_GOES_HERE/pspdfkit/latest.podspec' ++ pod 'react-native-pspdfkit', :path => '../node_modules/react-native-pspdfkit/react-native-pspdfkit.podspec' ++ pod 'PSPDFKit', podspec: 'https://customers.pspdfkit.com/pspdfkit-ios/latest.podspec' use_native_modules! end @@ -94,7 +94,7 @@ end 7. `cd ios` then run `pod install`. 8. Open `YourApp.xcworkspace` in Xcode: `open YourApp.xcworkspace`. -9. Make sure the deployment target is set to 11.0 or higher: +9. Make sure the deployment target is set to 12.0 or higher: ![Deployment Target](screenshots/deployment-target.png) 10. Change "View controller-based status bar appearance" to `YES` in `Info.plist`: ![View Controller-Based Status Bar Appearance](screenshots/view-controller-based-status-bar-appearance.png) @@ -275,11 +275,9 @@ Take a look at the [instructions to get started here](/samples/NativeCatalog/REA #### Running on Mac Catalyst -Using PSPDFKit React Native Wrapper on Mac Catalyst is not fully supported yet. We plan on adding full support for Mac Catalyst as soon as React Native and CocoaPods will full support Mac Catalyst. - -For more details, see [why we don't fully support Mac Catalyst yet here](ios/Experimental_Mac_Catalyst_Support.md#why-is-mac-catalyst-not-fully-supported-yet). +Using PSPDFKit React Native Wrapper on Mac Catalyst does not currently work due to a [Flipper and FlipperKit issue](https://github.com/facebook/react-native/issues/28810). -If you wish to try the experimental Support for Mac Catalyst, please follow [the instructions here.](ios/Experimental_Mac_Catalyst_Support.md) +If you wish to run your project on Mac Catalyst, please try the [following workaround which removes everything related to Flipper and FlipperKit](https://github.com/facebook/react-native/issues/28810#issuecomment-623357732). #### Configuration Mapping diff --git a/ios/Experimental_Mac_Catalyst_Support.md b/ios/Experimental_Mac_Catalyst_Support.md deleted file mode 100644 index 66154ecf..00000000 --- a/ios/Experimental_Mac_Catalyst_Support.md +++ /dev/null @@ -1,194 +0,0 @@ -## Experimental Mac Catalyst Support - -## Why is Mac Catalyst Not Fully Supported Yet? - -- Since React Native 0.60, [new React Native projects use CocoaPods by default](https://facebook.github.io/react-native/blog/2019/07/03/version-60#cocoapods-by-default). -- At the moment, the latest stable version of CocoaPods (1.8.4) does not support XCFrameworks, which are required for Mac Catalyst. Partial support for XCFrameworks has been added to CocoaPods version 1.9.0.beta.2. See https://github.com/CocoaPods/CocoaPods/issues/9148 for more details. -- React Native does not officially support Mac Catalyst. See https://github.com/react-native-community/discussions-and-proposals/issues/131 -- In our CocoaPods artifacts, we do not offer XCFrameworks yet, but we plan on offering them as soon as they are fully supported by the latest stable version of CocoaPods. - -Below, we walk you trough how to create your own local CocoaPods Artifacts that are compatible with XCFrameworks and Mac Catalyst. In this tutorial, we also discuss how to integrate PSPDFKit in a newly created React Native project and how to run it on a Mac. - -**Note:** Since the instructions involve modifying React Native code to make the project compile on Mac Catalyst, the project will on run only on macOS and not on iOS. - -### Requirements - -- Xcode 11.3.1 -- PSPDFKit 9.2.0 for iOS or later -- react-native >= 0.61.5 -- CocoaPods >= 1.9.0.beta.2 - -### Getting Started - -#### Creating the CocoaPods Artifacts - -1. If you’re an existing customer, download PSPDFKit for iOS from the [customer portal](https://customers.pspdfkit.com/). Otherwise, if you don’t already have PSPDFKit, [sign up for our 60-day trial](https://pspdfkit.com/try/) and you will receive an email with the download instructions. -2. Copy `PSPDFKit.xcframework` and `PSPDFKitUI.xcframework` in a writable location. -3. Remove `strip-bitcode.sh` and `strip-framework.sh` from `PSPDFKit.xcframework/*/PSPDFKit.framework`: - -```sh -rm PSPDFKit.xcframework/*/PSPDFKit.framework/strip-*.sh -``` - -4. Create an archive (`.zip` file) by compressing `PSPDFKit.xcframework` and `PSPDFKitUI.xcframework` into `PSPDFKit.zip`: - ![compress-xcframeworks](../screenshots/compress-xcframeworks.png) -5. Rename the resulting `Archive.zip` to `PSPDFKit.zip`. - -#### Integrating PSPDFKit in a New React Native Project - -Let's create a simple app that integrates PSPDFKit and uses the `react-native-pspdfkit` module. - -1. Make sure `react-native-cli` is installed: `yarn global add react-native-cli` -2. Create the app with `react-native init YourApp`. -3. Step into your newly created app folder: `cd YourApp` -4. Install `react-native-pspdfkit` from GitHub: `yarn add github:PSPDFKit/react-native` -5. Install all the dependencies for the project: `yarn install`. (Because of a [bug](https://github.com/yarnpkg/yarn/issues/2165) you may need to clean `yarn`'s cache with `yarn cache clean` before.) -6. Open `ios/Podile` in a text editor: `open ios/Podfile`, update the platform to iOS 11, and add the CocoaPods URLs: - -```diff -- platform :ios, '9.0' -+ platform :ios, '11.0' -require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' - -target 'YourApp' do - # Pods for YourApp - pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/React' - pod 'React-DevSupport', :path => '../node_modules/react-native/React' - pod 'React-fishhook', :path => '../node_modules/react-native/Libraries/fishhook' - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket' - - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga' - - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' - -+ pod 'react-native-pspdfkit', :path => '../node_modules/react-native-pspdfkit' -+ pod 'PSPDFKit', podspec:'PSPDFKit.podspec' - - use_native_modules! -end -``` - -7. In the `ios` folder, copy the CocoaPods artifatcs that you created earlier: `cp PSPDFKit.zip YourApp/ios/`. -8. In the `ios` folder, create a new `PSPDFKit.podspec` file with the following content: - -```podspec -Pod::Spec.new do |s| - s.name = 'PSPDFKit' - s.version = '9.2.0' - s.homepage = 'https://pspdfkit.com' - s.documentation_url = 'https://pspdfkit.com/guides/ios/current' - s.license = { :type => 'Commercial', :file => 'PSPDFKit.xcframework/LICENSE' } - s.author = { 'PSPDFKit GmbH' => 'support@pspdfkit.com' } - s.summary = 'The leading cross-platform PDF framework.' - - s.description = <<-DESC - The leading cross-platform PDF framework. - DESC - s.screenshots = 'https://pspdfkit.com/images/devices/ipad-air-hero-07c554d5.png' - - s.platform = :ios, '11.0' - s.source = { :http => 'file:' + __dir__ + '/PSPDFKit.zip' } - - s.library = 'z', 'sqlite3', 'xml2', 'c++' - s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/PSPDFKit/**"', - 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } - s.frameworks = 'QuartzCore', 'CoreText', 'CoreMedia', 'MediaPlayer', 'AVFoundation', 'ImageIO', 'MessageUI', - 'CoreGraphics', 'Foundation', 'CFNetwork', 'MobileCoreServices', 'SystemConfiguration', - 'Security', 'UIKit', 'AudioToolbox', 'QuickLook', 'CoreTelephony', - 'Accelerate', 'CoreImage' - s.requires_arc = true - s.swift_version = '5.0' - s.module_name = 'PSPDFKitSDK' - - s.default_subspec = 'Core' - - s.subspec 'Core' do |core| - core.preserve_paths = 'PSPDFKit.xcframework', 'PSPDFKitUI.xcframework' - core.public_header_files = 'PSPDFKit.xcframework/ios-arm64/PSPDFKit.framework/Headers/*.h', 'PSPDFKitUI.xcframework/ios-arm64/PSPDFKitUI.framework/Headers/*.h', 'PSPDFKit.xcframework/ios-x86_64-maccatalyst/PSPDFKit.framework/Headers/*.h', 'PSPDFKitUI.xcframework/ios-x86_64-maccatalyst/PSPDFKitUI.framework/Headers/*.h', 'PSPDFKit.xcframework/ios-x86_64-simulator/PSPDFKit.framework/Headers/*.h', 'PSPDFKitUI.xcframework/ios-x86_64-simulator/PSPDFKitUI.framework/Headers/*.h' - core.vendored_frameworks = 'PSPDFKit.xcframework', 'PSPDFKitUI.xcframework' - end -end -``` - -9. `cd ios` then run `pod install`. -10. Open `YourApp.xcworkspace` in Xcode: `open YourApp.xcworkspace`. -11. In Xcode in the Pods Xcode project > React-Core target > Build Phases > Compile Sources > RCTWebSocketModule.m change from `macOS + iOS`to `iOS` only - ![fix-rctwebsocket-mac-catalyst](../screenshots/fix-rctwebsocket-mac-catalyst.png) -12. Edit your target's scheme and change the build configuration from `Debug` to `Release`. This is a hack to workaround the fact that there are some APIs that are not supported on Mac Catalyst that are ifdef'ed out in the release build configuration: - ![edit-scheme](../screenshots/edit-scheme.png) - ![set-release-build-configuration](../screenshots/set-release-build-configuration.png) -13. Allow your target to run on iPad and Mac: - ![enable-mac](../screenshots/enable-mac.png) -14. Xcode will require you to select a development team in order to enable code signing and generate the right provisioning profiles. -15. Add a PDF by drag and dropping it into your Xcode project (Select "Create groups" and add to target "YourApp"). This will add the document to the "Copy Bundle Resources" build phase: - ![Adding PDF](../screenshots/adding-pdf.png) -16. Replace the default component from `App.js` with a simple touch area to present the bundled PDF. (Note that you can also use a [Native UI Component](../#native-ui-component) to show a PDF.) - -```javascript -import React, { Component } from "react"; -import { - AppRegistry, - StyleSheet, - NativeModules, - Text, - TouchableHighlight, - View -} from "react-native"; - -const PSPDFKit = NativeModules.PSPDFKit; - -PSPDFKit.setLicenseKey("INSERT_YOUR_LICENSE_KEY_HERE"); - -// Change 'YourApp' to your app's name. -export default class YourApp extends Component { - _onPressButton() { - PSPDFKit.present("document.pdf", {}); - } - - render() { - return ( - - - Tap to Open Document - - - ); - } -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - justifyContent: "center", - alignItems: "center", - backgroundColor: "#F5FCFF" - }, - text: { - fontSize: 20, - textAlign: "center", - margin: 10 - } -}); - -// Change both 'YourApp's to your app's name. -AppRegistry.registerComponent("YourApp", () => YourApp); -``` - -Your app is now ready to launch. Run the app in Xcode using `⌘+R`. - ![launched-app-mac-catalyst](../screenshots/launched-app-mac-catalyst.png) diff --git a/ios/RCTPSPDFKit.xcodeproj/project.pbxproj b/ios/RCTPSPDFKit.xcodeproj/project.pbxproj index 0e9c4b87..eec95b6e 100644 --- a/ios/RCTPSPDFKit.xcodeproj/project.pbxproj +++ b/ios/RCTPSPDFKit.xcodeproj/project.pbxproj @@ -286,7 +286,7 @@ "$(SRCROOT)/../../react-native/React/**", "$(SRCROOT)/../samples/Catalog/node_modules/react-native/React/**", ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -344,7 +344,7 @@ "$(SRCROOT)/../../react-native/React/**", "$(SRCROOT)/../samples/Catalog/node_modules/react-native/React/**", ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/package-lock.json b/package-lock.json index 6726ef4f..5bc9299b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.29.2", + "version": "1.29.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f2648677..b566006e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-pspdfkit", - "version": "1.29.2", + "version": "1.29.3", "description": "A React Native module for the PSPDFKit library.", "keywords": [ "react native", diff --git a/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj b/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj index d196c3d1..9daee7bc 100644 --- a/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj +++ b/samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj @@ -1248,7 +1248,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1299,7 +1299,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json index 70f30715..00506d8d 100644 --- a/samples/Catalog/package.json +++ b/samples/Catalog/package.json @@ -1,6 +1,6 @@ { "name": "Catalog", - "version": "1.29.2", + "version": "1.29.3", "private": true, "scripts": { "start": "react-native start", diff --git a/samples/NativeCatalog/README.md b/samples/NativeCatalog/README.md index f2c1194c..63a53128 100644 --- a/samples/NativeCatalog/README.md +++ b/samples/NativeCatalog/README.md @@ -24,52 +24,9 @@ maven { ### Running this Sample on iOS 1. Clone the repository. `git clone https://github.com/PSPDFKit/react-native.git`. -2. Install dependencies: run `yarn install` from `samples/NativeCatalog` directory. -3. Open `samples/NativeCatalog/ios/Podile` in a text editor: `open samples/NativeCatalog/ios/Podfile` and add your CocoaPods URL. - -```diff -platform :ios, '11.0' -require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' - -target 'YourApp' do - # Pods for YourApp - pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/React' - pod 'React-DevSupport', :path => '../node_modules/react-native/React' - pod 'React-fishhook', :path => '../node_modules/react-native/Libraries/fishhook' - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket' - - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga' - - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' - - pod 'react-native-pspdfkit', :path => '../node_modules/react-native-pspdfkit' -- pod 'PSPDFKit', podspec: 'https://customers.pspdfkit.com/cocoapods/YOUR_COCOAPODS_KEY_GOES_HERE/pspdfkit/latest.podspec' -+ pod 'PSPDFKit', podspec: 'https://customers.pspdfkit.com/cocoapods/USE_YOUR_OWN_COCOAPODS_KEY/pspdfkit/latest.podspec' -- pod 'Instant', podspec:'https://customers.pspdfkit.com/cocoapods/YOUR_COCOAPODS_KEY_GOES_HERE/instant/latest.podspec' -+ pod 'Instant', podspec:'https://customers.pspdfkit.com/cocoapods/USE_YOUR_OWN_COCOAPODS_KEY/instant/latest.podspec' - - use_native_modules! -end -``` - -4. `cd ios` then run `pod install`. -5. The Native Catalog app is now ready to launch. From `samples/NativeCatalog` directory run `react-native run-ios`. +2. Install dependencies: run `yarn install` from the `samples/NativeCatalog` directory. +3. `cd ios` then run `pod install`. +4. The Native Catalog app is now ready to launch. From `samples/NativeCatalog` directory run `react-native run-ios`. ### Examples @@ -84,3 +41,7 @@ This example shows you how to use the `PdfProcessor` on Android and `PSPDFRender #### Watermark on Startup This example shows you how to use the `PdfProcessor` on Android and `PSPDFRenderDrawBlock` on iOS to put a watermark on the currently displayed document on startup, save it to a new path, and display it. The relevant part is the `performWatermarking` method in the `CustomPdfViewManager` and `-[CustomPDFViewcreateWatermarkAndReloadData:]` on iOS. + +#### Instant Example + +In this example, we bridged the native iOS Instant example from [PSPDFKit Catalog](https://pspdfkit.com/guides/ios/current/getting-started/example-projects/#pspdfcatalog) over to React Natice. \ No newline at end of file diff --git a/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/project.pbxproj b/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/project.pbxproj index c8187b38..c3007766 100644 --- a/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/project.pbxproj +++ b/samples/NativeCatalog/ios/NativeCatalog.xcodeproj/project.pbxproj @@ -233,6 +233,7 @@ buildPhases = ( 34456C36ED5A4F745E28E799 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, + 3C8539E9E2E42A92B1663037 /* [CP] Prepare Artifacts */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, @@ -342,6 +343,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /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; @@ -349,21 +370,10 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NativeCatalog/Pods-NativeCatalog-frameworks.sh", - "${PODS_ROOT}/Instant/Instant.framework", - "${PODS_ROOT}/Instant/Instant.framework.dSYM", - "${PODS_ROOT}/PSPDFKit/PSPDFKit.framework", - "${PODS_ROOT}/PSPDFKit/PSPDFKit.framework.dSYM", - "${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework", - "${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework.dSYM", + "${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Instant.framework", - "${DWARF_DSYM_FOLDER_PATH}/Instant.framework.dSYM", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework", - "${DWARF_DSYM_FOLDER_PATH}/PSPDFKit.framework.dSYM", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework", - "${DWARF_DSYM_FOLDER_PATH}/PSPDFKitUI.framework.dSYM", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -607,7 +617,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -654,7 +664,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/samples/NativeCatalog/ios/Podfile b/samples/NativeCatalog/ios/Podfile index a8536b02..39d0b691 100644 --- a/samples/NativeCatalog/ios/Podfile +++ b/samples/NativeCatalog/ios/Podfile @@ -1,4 +1,4 @@ -platform :ios, '11.0' +platform :ios, '12.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' target 'NativeCatalog' do @@ -35,8 +35,8 @@ target 'NativeCatalog' do pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' pod 'react-native-pspdfkit', :path => '../node_modules/react-native-pspdfkit' - pod 'PSPDFKit', podspec:'https://customers.pspdfkit.com/cocoapods/YOUR_COCOAPODS_KEY_GOES_HERE/pspdfkit/latest.podspec' - pod 'Instant', podspec:'https://customers.pspdfkit.com/cocoapods/YOUR_COCOAPODS_KEY_GOES_HERE/instant/latest.podspec' + pod 'PSPDFKit', podspec:'https://customers.pspdfkit.com/pspdfkit-ios/latest.podspec' + pod 'Instant', podspec:'https://customers.pspdfkit.com/instant/latest.podspec' target 'NativeCatalogTests' do inherit! :search_paths diff --git a/samples/NativeCatalog/package.json b/samples/NativeCatalog/package.json index 5af82f7a..eceb19a8 100644 --- a/samples/NativeCatalog/package.json +++ b/samples/NativeCatalog/package.json @@ -1,6 +1,6 @@ { "name": "NativeCatalog", - "version": "1.29.2", + "version": "1.29.3", "private": true, "scripts": { "android": "react-native run-android", diff --git a/screenshots/compress-xcframeworks.png b/screenshots/compress-xcframeworks.png deleted file mode 100644 index 18e7f7c2..00000000 Binary files a/screenshots/compress-xcframeworks.png and /dev/null differ diff --git a/screenshots/deployment-target.png b/screenshots/deployment-target.png index 1923e144..8759ae3a 100644 Binary files a/screenshots/deployment-target.png and b/screenshots/deployment-target.png differ diff --git a/screenshots/edit-scheme.png b/screenshots/edit-scheme.png deleted file mode 100644 index 959ded00..00000000 Binary files a/screenshots/edit-scheme.png and /dev/null differ diff --git a/screenshots/enable-mac.png b/screenshots/enable-mac.png deleted file mode 100644 index 59676da2..00000000 Binary files a/screenshots/enable-mac.png and /dev/null differ diff --git a/screenshots/fix-rctwebsocket-mac-catalyst.png b/screenshots/fix-rctwebsocket-mac-catalyst.png deleted file mode 100644 index 2f76feb9..00000000 Binary files a/screenshots/fix-rctwebsocket-mac-catalyst.png and /dev/null differ diff --git a/screenshots/launched-app-mac-catalyst.png b/screenshots/launched-app-mac-catalyst.png deleted file mode 100644 index 580b3bf1..00000000 Binary files a/screenshots/launched-app-mac-catalyst.png and /dev/null differ diff --git a/screenshots/set-release-build-configuration.png b/screenshots/set-release-build-configuration.png deleted file mode 100644 index ac7fb008..00000000 Binary files a/screenshots/set-release-build-configuration.png and /dev/null differ