[Paywalls V2] Remove/replace PAYWALL_COMPONENTS compiler flag and f…

…ix OS/platform compile issues (#4727)

* We can't just remove PAYWALL_COMPONENT because we don't support macos and tv and things were failing

* Move PartialComponent outside of PaywallComponent extension

* Fix some lint errors

* Wrong thing

* Undid things i shouldn't have done

* Removed more

* Added comment

* Removed/fix some places for the check thingies

* RevenueCat module compiles on all the things

* RevenueCatUI compiles in all the platforms now

* Make all the things compile again

* Make work for visionOS

* Fix some platform and xcode version issues

* Fix failing spm ios 15 test

* Undo circleci changes

* Replace smooth with easeInOut

* Only run the thing i want

* Attempt to remove circular

* Explicit returns

* Does this pass

* This is it

* Swift 5.9 for this

* All tests again

* Undid public testing processor stuff

* Undo this too

* Swift compiler check out pill style circular

* Fixes from PR review

* Fix compile for mac

RevenueCat.xcodeproj/project.pbxproj

@@ -373,7 +373,6 @@
 		4D322E3A2B7E7B570004AF53 /* PurchasesOrchestratorSK1Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D322E392B7E7B570004AF53 /* PurchasesOrchestratorSK1Tests.swift */; };
 		4D322E3C2B7E7E250004AF53 /* PurchasesOrchestratorCommonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D322E3B2B7E7E250004AF53 /* PurchasesOrchestratorCommonTests.swift */; };
 		4D3BA4CC2D37D15E00668AFC /* PaywallTimelineComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3BA4CB2D37D15E00668AFC /* PaywallTimelineComponent.swift */; };
-		4D3BA4CD2D37D15E00668AFC /* PaywallTimelineComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3BA4CB2D37D15E00668AFC /* PaywallTimelineComponent.swift */; };
 		4D3BA5882D432E5900668AFC /* Fill.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3BA5872D432E5700668AFC /* Fill.swift */; };
 		4D3BA5B22D47AB4400668AFC /* TimelineComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3BA5AF2D47AB4400668AFC /* TimelineComponentView.swift */; };
 		4D3BA5B32D47AB4400668AFC /* TimelineComponentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3BA5B02D47AB4400668AFC /* TimelineComponentViewModel.swift */; };
@@ -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 */,
 				887A60722C1D037000E1A461 /* PaywallViewMode+Extensions.swift in Sources */,
 				887A60C32C1D037000E1A461 /* FooterView.swift in Sources */,
 				2C7457212CE702BB004ACE52 /* PackageContext.swift in Sources */,

RevenueCatUI/PaywallView.swift

@@ -253,7 +253,6 @@ public struct PaywallView: View {
             countries: offering.paywall?.zeroDecimalPlaceCountries
         )
 
-        #if PAYWALL_COMPONENTS
         if let paywallComponents = offering.paywallComponents {
 
             // For fallback view or footer
@@ -339,35 +338,6 @@ public struct PaywallView: View {
                 paywallView
             }
         }
-        #else
-        let (paywall, displayedLocale, template, error) = offering.validatedPaywall(locale: self.locale)
-
-        let paywallView = LoadedOfferingPaywallView(
-            offering: offering,
-            activelySubscribedProductIdentifiers: activelySubscribedProductIdentifiers,
-            paywall: paywall,
-            template: template,
-            mode: self.mode,
-            fonts: fonts,
-            displayCloseButton: self.displayCloseButton,
-            introEligibility: checker,
-            purchaseHandler: purchaseHandler,
-            locale: displayedLocale,
-            showZeroDecimalPlacePrices: showZeroDecimalPlacePrices
-        )
-
-        if let error {
-            DebugErrorView(
-                "\(error.description)\n" +
-                "You can fix this by editing the paywall in the RevenueCat dashboard.\n" +
-                "The displayed paywall contains default configuration.\n" +
-                "This error will be hidden in production.",
-                replacement: paywallView
-            )
-        } else {
-            paywallView
-        }
-        #endif
     }
 
     // MARK: -

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

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct ButtonComponentView: View {
@@ -43,9 +43,12 @@ struct ButtonComponentView: View {
         #if canImport(SafariServices) && canImport(UIKit)
         .sheet(isPresented: .isNotNil($inAppBrowserURL)) {
             SafariView(url: inAppBrowserURL!)
-        }.presentCustomerCenter(isPresented: $showCustomerCenter) {
-            showCustomerCenter = false
         }
+        #if os(iOS)
+        .presentCustomerCenter(isPresented: $showCustomerCenter, onDismiss: {
+            showCustomerCenter = false
+        })
+        #endif
         #endif
     }
 

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

@@ -15,7 +15,7 @@
 import Foundation
 import RevenueCat
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class ButtonComponentViewModel {

RevenueCatUI/Templates/V2/Components/ComponentsView.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct ComponentsView: View {

RevenueCatUI/Templates/V2/Components/Icon/IconComponentView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct IconComponentView: View {

RevenueCatUI/Templates/V2/Components/Icon/IconComponentViewModel.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 private typealias PresentedIconPartial = PaywallComponent.PartialIconComponent
 

RevenueCatUI/Templates/V2/Components/Image/ImageComponentView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct ImageComponentView: View {

RevenueCatUI/Templates/V2/Components/Image/ImageComponentViewModel.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class ImageComponentViewModel {

RevenueCatUI/Templates/V2/Components/Packages/Package/ComponentViewState.swift

@@ -14,7 +14,7 @@
 import Foundation
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 enum ComponentViewState {
     case `default`

RevenueCatUI/Templates/V2/Components/Packages/Package/PackageComponentView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct PackageComponentView: View {

RevenueCatUI/Templates/V2/Components/Packages/Package/PackageComponentViewModel.swift

@@ -14,7 +14,7 @@
 import Foundation
 import RevenueCat
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class PackageComponentViewModel {

RevenueCatUI/Templates/V2/Components/Packages/PurchaseButton/PurchaseButtonComponentView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct PurchaseButtonComponentView: View {

RevenueCatUI/Templates/V2/Components/Packages/PurchaseButton/PurchaseButtonComponentViewModel.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class PurchaseButtonComponentViewModel {

RevenueCatUI/Templates/V2/Components/Root/RootView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct RootView: View {

RevenueCatUI/Templates/V2/Components/Root/RootViewModel.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class RootViewModel {

RevenueCatUI/Templates/V2/Components/Stack/FlexHStack.swift

@@ -13,7 +13,7 @@
 
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct FlexHStack: View {

RevenueCatUI/Templates/V2/Components/Stack/FlexVStack.swift

@@ -13,7 +13,7 @@
 
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct FlexVStack: View {

RevenueCatUI/Templates/V2/Components/Stack/JustifyContent.swift

@@ -14,7 +14,7 @@
 import Foundation
 import RevenueCat
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 enum JustifyContent {
     case start, center, end, spaceBetween, spaceAround, spaceEvenly

RevenueCatUI/Templates/V2/Components/Stack/StackComponentView.swift

@@ -16,7 +16,7 @@ import SwiftUI
 
 // swiftlint:disable file_length
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct StackComponentView: View {

RevenueCatUI/Templates/V2/Components/Stack/StackComponentViewModel.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 typealias PresentedStackPartial = PaywallComponent.PartialStackComponent
 

RevenueCatUI/Templates/V2/Components/StickyFooter/StickyFooterComponentView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct StickyFooterComponentView: View {

RevenueCatUI/Templates/V2/Components/StickyFooter/StickyFooterComponentViewModel.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class StickyFooterComponentViewModel {

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

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct TabControlButtonComponentView: View {

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

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TabControlButtonComponentViewModel {

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

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct TabControlComponentView: View {

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

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TabControlComponentViewModel {

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

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct TabControlToggleComponentView: View {
@@ -83,7 +83,7 @@ private struct CustomToggleStyle: ToggleStyle {
                     .offset(x: configuration.isOn ? 10 : -10)
             )
             .onTapGesture {
-                withAnimation(.smooth(duration: 0.2)) {
+                withAnimation(.easeInOut(duration: 0.2)) {
                     configuration.isOn.toggle()
                 }
             }

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

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TabControlToggleComponentViewModel {

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

@@ -16,7 +16,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TabControlContext: ObservableObject {

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

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TabsComponentViewModel {

RevenueCatUI/Templates/V2/Components/Text/TextComponentView.swift

@@ -17,7 +17,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct TextComponentView: View {

RevenueCatUI/Templates/V2/Components/Text/TextComponentViewModel.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TextComponentViewModel {

RevenueCatUI/Templates/V2/Components/Timeline/TimelineComponentView.swift

@@ -15,7 +15,7 @@ import Foundation
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct TimelineComponentView: View {

RevenueCatUI/Templates/V2/Components/Timeline/TimelineComponentViewModel.swift

@@ -14,7 +14,7 @@
 import Foundation
 import RevenueCat
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class TimelineComponentViewModel {

RevenueCatUI/Templates/V2/EnvironmentObjects/IntroOfferEligibilityContext.swift

@@ -14,7 +14,7 @@
 import Combine
 import RevenueCat
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @MainActor
 class IntroOfferEligibilityContext: ObservableObject {

RevenueCatUI/Templates/V2/EnvironmentObjects/PackageContext.swift

@@ -14,7 +14,7 @@
 import RevenueCat
 import SwiftUI
 
-#if PAYWALL_COMPONENTS
+#if !os(macOS) && !os(tvOS) // For Paywalls V2
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class PackageContext: ObservableObject {