[Paywalls V2] Remove/replace `PAYWALL_COMPONENTS` compiler flag and fix OS/platform compile issues #4727

joshdholtz · 2025-01-28T23:36:08Z

Motivation

Let it be public!

Description

RevenueCat module
- Removed all #if PAYWALL_COMPONENTS
RevenueCatUI module
- Replace the rest of #if PAYWALL_COMPONENTS with #if !os(watchOS) && !os(macOS) // For Paywalls V2
  - Added the comment for easy finding in the future
- Fixed compile errors in macOS and watchOS
Fixed a BUNCH of compile issues with older OS versions and platforms

joshdholtz · 2025-01-29T01:58:18Z

@RCGitBot please test

joshdholtz · 2025-01-29T02:22:15Z

@RCGitBot please test

joshdholtz · 2025-01-29T02:56:58Z

@RCGitBot please test

joshdholtz · 2025-01-29T03:20:12Z

@RCGitBot please test

joshdholtz · 2025-01-29T11:09:32Z

@RCGitBot please test

joshdholtz · 2025-01-29T11:29:43Z

@RCGitBot please test

joshdholtz · 2025-01-29T12:31:30Z

@RCGitBot please test

… and tv and things were failing

joshdholtz · 2025-01-29T14:32:16Z

@RCGitBot please test

joshdholtz · 2025-01-29T15:28:55Z

RevenueCatUI/Templates/V2/ViewHelpers/ShadowModifier.swift

@@ -42,6 +42,7 @@ struct ShadowModifier: ViewModifier {
    let shape: (any Shape)?

    func body(content: Content) -> some View {
+        #if !os(watchOS)


Executive decision to not support watchOS (right now) in ShadowModifier because we don't support watchOS in Paywalls V2 yet anyway

joshdholtz · 2025-01-29T15:32:28Z

Sources/Paywalls/Components/Common/ComponentOverrides.swift

+public protocol PaywallPartialComponent: PaywallComponentBase {}

 public extension PaywallComponent {

-    protocol PartialComponent: PaywallComponentBase {}
+    typealias ComponentOverrides<T: PaywallPartialComponent> = [ComponentOverride<T>]


Older Swift got angry about this being inside of an extension

Older Swift:
☁️
✊

facumenzella · 2025-01-29T15:41:59Z

Probably a good idea to get more eyes on this

facumenzella · 2025-01-29T15:43:06Z

RevenueCatUI/Templates/V2/ViewHelpers/Fill.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI

-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2


I am commenting here because this is where GitHub let's me.
I updated on my other PR line 33 self.fill() because it wasn't compiling either. MAYBE we can see if it works now without it?

@MarkVillacampa

joshdholtz · 2025-01-29T15:44:31Z

@RCGitBot please test

vegaro · 2025-01-29T15:49:39Z

RevenueCat.xcodeproj/project.pbxproj

@@ -6725,7 +6724,6 @@
 				88A543E12C37A4820039C6A5 /* TemplateView+MultiTier.swift in Sources */,
 				3523048A2D0A0F30003971A4 /* ErrorView.swift in Sources */,
 				887A60B72C1D037000E1A461 /* WatchTemplateView.swift in Sources */,
-				4D3BA4CD2D37D15E00668AFC /* PaywallTimelineComponent.swift in Sources */,


Just double checking we want this removed from here, I see in the other change it was duplicated, but I don't see PaywallTimelineComponent in this section?

Yeah yeah! It was added to both RevenueCat and RevenueCatUI targets which was wrong 😅 So I removed the RevenueCatUI one since this file is part of the offerings response codable stuff

But thanks for checking 🙏

RevenueCatUI/Templates/V2/Components/Button/ButtonComponentView.swift

vegaro

There are still some references to the flag in the fastfile build_paywalls_tester_for_emerge and in two ci_pre_xcodebuild.sh

vegaro · 2025-01-29T16:05:02Z

Tests/UnitTests/Paywalls/Components/Properties/MaskShapePropertyTests.swift

-            PaywallComponent.MaskShape.self,
-            from: json.data(using: .utf8)!
-        )
-    }


is this removal intentional?

Yeah yeah! pill type is no longer supported and the test were behind compiler flag so it didn't get caught by CI for a while 🫠

joshdholtz · 2025-01-29T16:13:24Z

@RCGitBot please test

tonidero

LGTM!

tonidero · 2025-01-29T16:20:50Z

RevenueCatUI/UIKit/PaywallViewController.swift

@@ -13,10 +13,12 @@

 // swiftlint:disable file_length

+import SwiftUI


Any reason we need to move this outside the #if?

Ahhh yeah, for the applyIf that are at the bottom of the file 😅 Its not clear and those should probably get moved somewhere else at some point 🤷‍♂️

JayShortway

What a milestone!

JayShortway · 2025-01-29T16:25:31Z

RevenueCatUI/Templates/V2/Components/Tabs/TabControlToggleComponentView.swift

-                withAnimation(.smooth(duration: 0.2)) {
+                withAnimation(.easeInOut(duration: 0.2)) {


Is this intended? (Maybe smooth is not supported on older versions?)

Yeah yeah, intended 😊 Had issues with smooth on older OS versions so just moved to easeInOut 🤷‍♂️

JayShortway · 2025-01-29T16:27:39Z

Sources/Paywalls/Components/Common/ComponentOverrides.swift

+public protocol PaywallPartialComponent: PaywallComponentBase {}

 public extension PaywallComponent {

-    protocol PartialComponent: PaywallComponentBase {}
+    typealias ComponentOverrides<T: PaywallPartialComponent> = [ComponentOverride<T>]


Older Swift:
☁️
✊

JayShortway · 2025-01-29T16:30:00Z

Sources/Purchasing/Offering.swift

-    public init(
-        identifier: String,
-        serverDescription: String,
-        metadata: [String: Any] = [:],
-        paywall: PaywallData? = nil,
-        availablePackages: [Package]
-    ) {


Just double checking if this is intentional?

Yup yup! The part we kept above just added paywallComponents: PaywallComponents? = nil, as additional parameter

ajpallares

LGTM

joshdholtz · 2025-01-29T16:35:28Z

@RCGitBot please test

joshdholtz added pr:feat A new feature pr:RevenueCatUI feat:PaywallV2 labels Jan 28, 2025

joshdholtz force-pushed the paywalls-v2/remove-compiler-flag-TAKE-2 branch 3 times, most recently from 8a06164 to 4fd3cc9 Compare January 29, 2025 00:12

joshdholtz force-pushed the paywalls-v2/remove-compiler-flag-TAKE-2 branch from 63b7b52 to 82ca8d5 Compare January 29, 2025 11:08

joshdholtz added 16 commits January 29, 2025 06:34

We can't just remove PAYWALL_COMPONENT because we don't support macos…

281c2a4

… and tv and things were failing

Move PartialComponent outside of PaywallComponent extension

20a8e04

Fix some lint errors

f21ff99

Wrong thing

51e68a1

Undid things i shouldn't have done

54f3151

Removed more

86ebde8

Added comment

6bbb72d

Removed/fix some places for the check thingies

097248d

RevenueCat module compiles on all the things

452b032

RevenueCatUI compiles in all the platforms now

755971d

Make all the things compile again

69ffbbe

Make work for visionOS

85d6da1

Fix some platform and xcode version issues

6d3164f

Fix failing spm ios 15 test

4cae4b4

Undo circleci changes

301412b

Replace smooth with easeInOut

1cbadf1

Undo this too

957ff6e

joshdholtz marked this pull request as ready for review January 29, 2025 15:22

joshdholtz requested review from a team January 29, 2025 15:22

joshdholtz changed the title ~~[Paywalls V2] Remove PAYWALL_COMPONENTS compiler flag~~ [Paywalls V2] Remove/replace PAYWALL_COMPONENTS compiler flag and fix OS/platform compile issues Jan 29, 2025

joshdholtz commented Jan 29, 2025

View reviewed changes

Swift compiler check out pill style circular

1b782cc

facumenzella approved these changes Jan 29, 2025

View reviewed changes

facumenzella reviewed Jan 29, 2025

View reviewed changes

vegaro reviewed Jan 29, 2025

View reviewed changes

RevenueCatUI/Templates/V2/Components/Button/ButtonComponentView.swift Show resolved Hide resolved

vegaro reviewed Jan 29, 2025

View reviewed changes

Fixes from PR review

7c96e1d

vegaro reviewed Jan 29, 2025

View reviewed changes

vegaro approved these changes Jan 29, 2025

View reviewed changes

tonidero approved these changes Jan 29, 2025

View reviewed changes

MarkVillacampa approved these changes Jan 29, 2025

View reviewed changes

JayShortway approved these changes Jan 29, 2025

View reviewed changes

ajpallares approved these changes Jan 29, 2025

View reviewed changes

Fix compile for mac

6ae501b

joshdholtz merged commit 3d86d7d into main Jan 29, 2025
38 checks passed

joshdholtz deleted the paywalls-v2/remove-compiler-flag-TAKE-2 branch January 29, 2025 17:53

This was referenced Jan 30, 2025

[DO NOT MERGE] [AUTOMATIC] Release/5.16.0 #4747

Closed

[AUTOMATIC] Release/5.16.0 #4751

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Paywalls V2] Remove/replace `PAYWALL_COMPONENTS` compiler flag and fix OS/platform compile issues #4727

[Paywalls V2] Remove/replace `PAYWALL_COMPONENTS` compiler flag and fix OS/platform compile issues #4727

joshdholtz commented Jan 28, 2025 •

edited

Loading

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz Jan 29, 2025

joshdholtz Jan 29, 2025

JayShortway Jan 29, 2025

facumenzella commented Jan 29, 2025

facumenzella Jan 29, 2025

joshdholtz commented Jan 29, 2025

vegaro Jan 29, 2025

joshdholtz Jan 29, 2025

vegaro left a comment

vegaro Jan 29, 2025

joshdholtz Jan 29, 2025

joshdholtz commented Jan 29, 2025

tonidero left a comment

tonidero Jan 29, 2025

joshdholtz Jan 29, 2025

JayShortway left a comment

JayShortway Jan 29, 2025

joshdholtz Jan 29, 2025

JayShortway Jan 29, 2025

JayShortway Jan 29, 2025

joshdholtz Jan 29, 2025

ajpallares left a comment

joshdholtz commented Jan 29, 2025

		@@ -13,10 +13,12 @@

		// swiftlint:disable file_length

		import SwiftUI

		withAnimation(.smooth(duration: 0.2)) {
		withAnimation(.easeInOut(duration: 0.2)) {

[Paywalls V2] Remove/replace PAYWALL_COMPONENTS compiler flag and fix OS/platform compile issues #4727

[Paywalls V2] Remove/replace PAYWALL_COMPONENTS compiler flag and fix OS/platform compile issues #4727

Conversation

joshdholtz commented Jan 28, 2025 • edited Loading

Motivation

Description

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

joshdholtz commented Jan 29, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

facumenzella commented Jan 29, 2025

Choose a reason for hiding this comment

joshdholtz commented Jan 29, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vegaro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joshdholtz commented Jan 29, 2025

tonidero left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JayShortway left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ajpallares left a comment

Choose a reason for hiding this comment

joshdholtz commented Jan 29, 2025

[Paywalls V2] Remove/replace `PAYWALL_COMPONENTS` compiler flag and fix OS/platform compile issues #4727

[Paywalls V2] Remove/replace `PAYWALL_COMPONENTS` compiler flag and fix OS/platform compile issues #4727

joshdholtz commented Jan 28, 2025 •

edited

Loading