Generate Mac Catalyst screenshots of Paywall components to be sent to EmergeTools by clindsay3 · Pull Request #5303 · RevenueCat/purchases-ios

clindsay3 · 2025-06-18T05:50:13Z

Motivation

In order to support Mac Catalyst for Paywall V2, we need to have a mechanism to verify the correctness of all components. This will also provide a quantifiable roadmap towards implementation of support for Mac Catalyst, since we can check off which components are working properly.

Description

Adds 4 new build variations to the Fastfile, for the two variants of Catalyst (Optimized for Mac, and Scaled to Match iPad) and two variants of running iOS apps on Mac (Designed for iPhone and Designed for iPad)
Adds a "Designed for iPad/iPhone" target to PaywallsTester target.
Adds a new preview to TextComponent called "Detected Platform", that displays which variant of iOS/macOS the component is being viewed on. This will help us sanity check that the screenshots being generated on Emerge are being generated on the expected platform.
The two Designed for iOS variants have been disabled in this commit, until Emerge finishes adding support for them.
Adds a whitelist (including PaywallsTester and RevenueCatUI) to our EmergeTools preview-based screenshot generation. This gets around a bug in EmergeTools where previews internal to the StoreKit framework were being generated. Should be fixed in the next release of EmergeTools (by this PR: Better image path check EmergeTools/SnapshotPreviews#239).

Just testing how Emerge will handle Mac variants.

emerge-tools · 2025-06-18T05:55:22Z

📸 Snapshot Test

Base build not found

No build was found for the base commit f3405d8. This is required to generate a snapshot diff for your pull request.

It's possible that you created a branch off the base commit before all of the CI steps have finished processing, e.g. the one that uploads a build to our system. If that's the case, no problem! Just wait and this will eventually resolve.

🛸 Powered by Emerge Tools

…lly running in the correct environment.

…e call te emerge.

…igned_for_ipad

…alls/test-preview

…mage.

…losely to previous version that was working as possible.

…variants.

…p bundle to run iPad/iPhone app on Mac.

…eing included in EmergeTools prevew.s

Hoping that this will help Emerge pick up the test filtering on the server.

Without this, we are getting unexpected internal StoreKit previews in our builds.

joshdholtz · 2025-07-08T11:44:00Z

@clindsay3 FYI, I just rebased this from main so that the Emerge Snapshot build has latest previous commit to run 💪

joshdholtz

This looks good to me! 🙌

I just rebased from main and pushed so that the Emerge snapshots have the latest to run and pass 😊

joshdholtz · 2025-07-08T11:37:53Z

Sources/LocalReceiptParsing/Helpers/ProcessInfo+Extensions.swift

+            if #available(iOS 14.0, *), isiOSAppOnMac {
+                switch UIDevice.current.userInterfaceIdiom {
+                case .phone:
+                    return "iPhone App on Mac"
+                case .pad:
+                    return "iPad App on Mac"
+                default:
+                    return "Unexpected iOS App on Mac"
+                }
+            } else {
+                switch UIDevice.current.userInterfaceIdiom {
+                case .mac:
+                    return "Mac Catalyst Optimized for Mac"
+                case .pad:
+                    return "Mac Catalyst Scaled to iPad"
+                default:
+                    return "Unexpected Platform on Mac Catalyst"
+                }
+            }


This is a crazy switch but it makes sense 😀

Tests/TestingApps/PaywallsTester/PaywallsTesterTests/PaywallsTesterTests.swift

ajpallares

Looks good to me! I just have some small questions, mostly about the wording of comments for future us 😄
Great job!

Sources/LocalReceiptParsing/Helpers/ProcessInfo+Extensions.swift

Tests/TestingApps/PaywallsTester/PaywallsTester.xcodeproj/project.pbxproj

Tests/TestingApps/PaywallsTester/PaywallsTesterTests/PaywallsTesterTests.swift

fastlane/Fastfile

Co-authored-by: Antonio Pallares <ajpallares@users.noreply.github.com>

…chases-ios into mac-paywalls/test-preview # Conflicts: # Sources/LocalReceiptParsing/Helpers/ProcessInfo+Extensions.swift # fastlane/Fastfile

…frameworks.

Add Mac and Mac Catalyst variants to a preview.

f4dafee

Just testing how Emerge will handle Mac variants.

clindsay3 and others added 28 commits June 18, 2025 15:06

Adjust the string based on the platform, so we can see if we're actua…

98b4821

…lly running in the correct environment.

Try adding support for Mac Catalyst.

c9584d0

Add a Mac action to build emerge screenshots.

fdbdcae

Trigger both iOS and Mac Catalyst screenshots from the existing action.

90d94cd

Refactor duplicated code into shared send_to_emerge lane.

7e55faa

Add another lane for designed for iPad, and add app ID suffixes to th…

c706930

…e call te emerge.

Add App ID suffix to tag, to see if it's getting set

7fc2d52

Try to get app ID to appear in Emerge.

d20dac9

Fix typo

8acd0ab

Get rid of iOS suffix, and stop using tag.

6556953

Switch from underscores to dashes, see if that fixes the issue.

9d58850

Try removing iOS version for now.

21776ec

Allow provisioning updates.

0ef69fc

Trying to build with designed for iPad.

2815fd5

Add "iPhone App on Mac" and "iPad App on Mac" distinction.

7b0f4ec

Add variants for different kinds of Mac Catalyst.

db502b4

Try to use match to get the correct provisioning profile.

4547091

Lets try building on CI like this

5d1a7b8

Forgot to remove export from build_paywalls_tester_for_emerge_mac_des…

deec828

…igned_for_ipad

Oops, catalyst for ipad thingy needs to skip IPA

1f804e8

Merge commit '9f2249deb669f8b29393ae02779dc79b7ae53cc7' into mac-payw…

e6ba13c

…alls/test-preview

Fix detection of iOS platform, and move the display into a separate i…

2322db3

…mage.

Add configurations for other iOS-based Mac platforms.

bc3a250

Fix bug from removing app_id_suffix.

3a59012

Remove extra argument.

c92796e

Don't package IPA, causing error.

c43a63e

Update fastlane readme.

1e1e827

Map to previous set of supported platforms

e8f6005

clindsay3 added 16 commits July 8, 2025 06:43

Fix missing space.

a7d02b5

Try disabling skip_package_ipa on catalyst builds.

e64c6e9

Remove targeted device families xcarg, see if that fixes issue.

43ecfeb

Temporarily disable other catalyst options to try to match build as c…

d1008a3

…losely to previous version that was working as possible.

Re-enable designed-for-ipad, to line up behavior with working commit

fb1b982

Re-enable switching between optimized for iPad and optimized for Mac …

bb7a95c

…variants.

Update emerge component screenshots with proper way to generate an ap…

eee2672

…p bundle to run iPad/iPhone app on Mac.

Fix send_to_emerge mistakenly removed.

eb4bdc1

Fix accidentally removed contents of send_to_emerge.

aff0a4e

Stop trying to build iOS apps on Mac until Emerge supports it.

8194ea2

Move platform info into a ProcessInfo extension.

e27e499

Add a note about supported bundle identifiers.

832eb61

Fix linter errors.

d022fdd

Fix an issue where previews internal to the StoreKit framework were b…

f99afd3

…eing included in EmergeTools prevew.s

Fix build of PaywallsTesterTests.

98ee319

Hoping that this will help Emerge pick up the test filtering on the server.

Add an emerge config, to exclude unrelated previews.

3a3ac5e

Without this, we are getting unexpected internal StoreKit previews in our builds.

joshdholtz force-pushed the mac-paywalls/test-preview branch from f064fbe to 3a3ac5e Compare July 8, 2025 11:43

joshdholtz approved these changes Jul 8, 2025

View reviewed changes

ajpallares approved these changes Jul 8, 2025

View reviewed changes

clindsay3 and others added 5 commits July 9, 2025 11:35

Update fastlane/Fastfile

f207a17

Co-authored-by: Antonio Pallares <ajpallares@users.noreply.github.com>

Distinguish between iOS and iPad OS in platformString.

f546857

Merge branch 'mac-paywalls/test-preview' of github.com:RevenueCat/pur…

92c0241

…chases-ios into mac-paywalls/test-preview # Conflicts: # Sources/LocalReceiptParsing/Helpers/ProcessInfo+Extensions.swift # fastlane/Fastfile

Update comments about exclusions restricting screenshots only to our …

0eeadcd

…frameworks.

Merge branch 'main' into mac-paywalls/test-preview

4af1238

clindsay3 enabled auto-merge (squash) July 9, 2025 03:29

joshdholtz disabled auto-merge July 9, 2025 10:09

joshdholtz merged commit 973009b into main Jul 9, 2025
10 of 12 checks passed

joshdholtz deleted the mac-paywalls/test-preview branch July 9, 2025 10:09

RCGitBot mentioned this pull request Jul 16, 2025

[AUTOMATIC] Release/5.33.0 #5389

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Generate Mac Catalyst screenshots of Paywall components to be sent to EmergeTools#5303

Generate Mac Catalyst screenshots of Paywall components to be sent to EmergeTools#5303
joshdholtz merged 95 commits intomainfrom
mac-paywalls/test-preview

clindsay3 commented Jun 18, 2025 •

edited

Loading

Uh oh!

emerge-tools bot commented Jun 18, 2025 •

edited

Loading

Uh oh!

joshdholtz commented Jul 8, 2025

Uh oh!

joshdholtz left a comment

Uh oh!

joshdholtz Jul 8, 2025

Uh oh!

Uh oh!

ajpallares left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

clindsay3 commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation

Description

Uh oh!

emerge-tools bot commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📸 Snapshot Test

Base build not found

Uh oh!

joshdholtz commented Jul 8, 2025

Uh oh!

joshdholtz left a comment

Choose a reason for hiding this comment

Uh oh!

joshdholtz Jul 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ajpallares left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

clindsay3 commented Jun 18, 2025 •

edited

Loading

emerge-tools bot commented Jun 18, 2025 •

edited

Loading