Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Mac Catalyst, PSPDFKit 10.1 for iOS, iOS 14, and Xcode 12.2 #9

Merged
merged 21 commits into from
Dec 9, 2020

Conversation

radazzouz
Copy link
Contributor

@radazzouz radazzouz commented Feb 16, 2020

Details

This PR updates the PDFXKit project to add support for Mac Catalyst, PSPDFKit 10 for iOS, iOS 14, and Xcode 12.

However, since Carthage does not support XCFrameworks at all, we're removing the Carthage integration.

Only the manual setup and the CocoaPods integrations will be supported.

This PR also updates PDFXKitExample, making it a separate Xcode project which uses the resulting XCFramework, rather than the fat framework from PDFXKit project. We do this to support Mac Catalyst.

  • The README is updated.
  • The PDFXKitExample app works great on iOS (both simulator and device) and Mac Catalyst.
  • rake compile works
  • The CocoaPods integration works in a sample project

@radazzouz radazzouz changed the title [WIP] [Experimental] Add support for Mac Catalyst Add support for Mac Catalyst Sep 16, 2020
@radazzouz radazzouz changed the title Add support for Mac Catalyst Add support for Mac Catalyst, PSPDFKit 10 for iOS, iOS 14, and Xcode 12. Sep 16, 2020
@radazzouz radazzouz removed the request for review from matej November 20, 2020 19:45
@radazzouz radazzouz changed the title Add support for Mac Catalyst, PSPDFKit 10 for iOS, iOS 14, and Xcode 12. Add support for Mac Catalyst, PSPDFKit 10.1 for iOS, iOS 14, and Xcode 12.2. Nov 20, 2020
@radazzouz radazzouz requested a review from matej November 20, 2020 21:16
@radazzouz radazzouz changed the title Add support for Mac Catalyst, PSPDFKit 10.1 for iOS, iOS 14, and Xcode 12.2. Add support for Mac Catalyst, PSPDFKit 10.1 for iOS, iOS 14, and Xcode 12.2 Nov 20, 2020
Copy link
Member

@matej matej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested local builds, xcframework generation and CocoaPods. It all seems to work nicely. The only thing that stood out are the CocoaPods instructions.

@@ -53,66 +53,35 @@ PDFXKit as a dependency to your `Podfile`.
``` Ruby
# Replace `YourAppName` with your app's target name.
target :YourAppName do
use_frameworks!

pod 'PSPDFKit', podspec: 'https://customers.pspdfkit.com/pspdfkit-ios/latest-framework.podspec'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the dependency now queried implicitly? The docs above still say "You'll have to add PSPDFKit as well as PDFXKit as a dependency to your Podfile.". We either should adjust that or keep pod 'PSPDFKit' (but we no longer need the URL).

Copy link
Contributor Author

@radazzouz radazzouz Dec 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! The integration is now implicit because PSPDFKit is a dependency in the podspec (https://github.com/PSPDFKit/PDFXKit/pull/9/files#diff-6f2cb93d716e8580740436aa50d12b4ca997d27f1ebe7c02ea1ba8e5d4d1a47b).

I'll add back the pod (with the URL to be explicit) in the README.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could also just change the description (i.e., remove "You'll have to add PSPDFKit as well as PDFXKit as a dependency to your Podfile") and keep the simpler form.

@radazzouz radazzouz merged commit 6748077 into master Dec 9, 2020
@radazzouz radazzouz deleted the rad/mac-catalyst branch December 9, 2020 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants