Merge branch 'main' into dave/vc-spend

Author: davedelong

.version

@@ -1 +1 @@
-5.86.0-SNAPSHOT
+5.87.0-SNAPSHOT

CHANGELOG.latest.md

@@ -1,20 +1,44 @@
 ## RevenueCat SDK
 ### ✨ New Features
-* feat(ads): admob adapter support for reward tracking (#7344) via Peter Porfy (@peterporfy)
-### 🐞 Bugfixes
-* fix: order queue receipt post after in-flight purchase post (#7072) via Antonio Pallares (@ajpallares)
+* feat: add confirmInScene & confirmInWindow purchase params (#4779) via Will Taylor (@fire-at-will)
+* feat: Expose displayName and originalPurchaseDate on NonSubscriptionTransaction (#7471) via Facundo Menzella (@facumenzella)
+* Track checkpoint hits through the analytics events pipeline (#7447) via Facundo Menzella (@facumenzella)
 
 ## RevenueCatUI SDK
 ### Paywallsv2
 #### 🐞 Bugfixes
-* Fix font scaling setting on workflow paywalls (#7428) via Cesar de la Vega (@vegaro)
+* Remove already-subscribed logic from paywalls (#7487) via Antonio Pallares (@ajpallares)
+* fix(paywalls): render `product.offer_price` with the same currency format as other prices (#7270) via Cesar de la Vega (@vegaro)
+* Fix workflows ignoring `zero_decimal_place_countries` (#7474) via Cesar de la Vega (@vegaro)
+### Customer Center
+#### 🐞 Bugfixes
+* Fix Customer Center prices for subscriptions from different Apple IDs (#7427) via Cesar de la Vega (@vegaro)
 
 ### 🔄 Other Changes
-* Add rc.rootVar operator for root scope in RulesEngine (#7432) via Antonio Pallares (@ajpallares)
-* feat(checkpoints): Add the app's subscriber attributes as a rules dimension (#7443) via Rick (@rickvdl)
-* feat(checkpoints): Add date and record collection rules dimension values (#7442) via Rick (@rickvdl)
-* feat(Checkpoints): validate checkpoint identifiers (#7441) via Rick (@rickvdl)
-* Read the SDK API feed channel from the CI context (#7446) via Álvaro Brey (@AlvaroBrey)
-* Chore(deps): Bump fastlane-plugin-revenuecat_internal from `7fbbe66` to `7dd9ab9` (#7449) via dependabot[bot] (@dependabot[bot])
-* Add Scope plumbing and custom operator extension point (#7433) via Antonio Pallares (@ajpallares)
-* Announce a public API change in the SDK API feed once per PR (#7431) via Álvaro Brey (@AlvaroBrey)
+* Remove `@objc` from the new `confirmIn` purchase params (#7493) via Antonio Pallares (@ajpallares)
+* Add a transform entry point to the rules engine (#7486) via Antonio Pallares (@ajpallares)
+* Add nested variable rc.lower fixture case (#7484) via Antonio Pallares (@ajpallares)
+* [CI] Collapse the two check-api-changes jobs into one (#7476) via Antonio Pallares (@ajpallares)
+* Add rc.entries and rc.fromEntries custom operators (#7435) via Antonio Pallares (@ajpallares)
+* Raise an error for unresolved variables instead of degrading to null (#7460) via Antonio Pallares (@ajpallares)
+* Adopt shared Renovate config (#7485) via Álvaro Brey (@AlvaroBrey)
+* Add unwrapped rc.length fixture case (#7483) via Antonio Pallares (@ajpallares)
+* Add rc.split custom operator (#7473) via Antonio Pallares (@ajpallares)
+* Inject and refresh IAM tokens (#7440) via Dave DeLong (@davedelong)
+* Implement IAM Login Operations (#7439) via Dave DeLong (@davedelong)
+* HTTP Paths can change their absolute path based on IAM enablement (#7422) via Dave DeLong (@davedelong)
+* IAM Login part 2 (#7410) via Dave DeLong (@davedelong)
+* Fix Test run for watch and tvos (#7479) via Jacob Rakidzich (@JZDesign)
+* Bump sdks-common-config to 4.6.1 to cache the mise toolchain (#7478) via Antonio Pallares (@ajpallares)
+* Properly publish API modifications (no add/delete) in the SDK API feed (#7451) via Álvaro Brey (@AlvaroBrey)
+* Chore: Walk the workflow tree to broadcast prewarming data (#7420) via Jacob Rakidzich (@JZDesign)
+* Chore(Paywalls): Invoke the warmer from the coordinator (#7469) via Jacob Rakidzich (@JZDesign)
+* [CI] Build the nine platform swiftinterfaces in parallel (#6454) via Antonio Pallares (@ajpallares)
+* Fix(CI): Skip tests on unsupported os versions (#7477) via Jacob Rakidzich (@JZDesign)
+* Chore: Create WebBundleCachePrewarmer (#7429) via Jacob Rakidzich (@JZDesign)
+* Add rc.lower and rc.upper custom operators (#7436) via Antonio Pallares (@ajpallares)
+* Fix(CI): Correct type and add compiler check for old xcode version support (#7462) via Jacob Rakidzich (@JZDesign)
+* Chore: Signal purchases-ui on purchases configuration (#7407) via Jacob Rakidzich (@JZDesign)
+* Chore: Set up mechanism for WebView Caching (started with Clearing) (#7409) via Jacob Rakidzich (@JZDesign)
+* Rename the checkpoint event's `session_id` to `app_session_id` (#7459) via Cesar de la Vega (@vegaro)
+* Add rc.length operator for strings and arrays (#7437) via Antonio Pallares (@ajpallares)

CHANGELOG.md

@@ -1,3 +1,49 @@
+## 5.86.0
+## RevenueCat SDK
+### ✨ New Features
+* feat: add confirmInScene & confirmInWindow purchase params (#4779) via Will Taylor (@fire-at-will)
+* feat: Expose displayName and originalPurchaseDate on NonSubscriptionTransaction (#7471) via Facundo Menzella (@facumenzella)
+* Track checkpoint hits through the analytics events pipeline (#7447) via Facundo Menzella (@facumenzella)
+
+## RevenueCatUI SDK
+### Paywallsv2
+#### 🐞 Bugfixes
+* Remove already-subscribed logic from paywalls (#7487) via Antonio Pallares (@ajpallares)
+* fix(paywalls): render `product.offer_price` with the same currency format as other prices (#7270) via Cesar de la Vega (@vegaro)
+* Fix workflows ignoring `zero_decimal_place_countries` (#7474) via Cesar de la Vega (@vegaro)
+### Customer Center
+#### 🐞 Bugfixes
+* Fix Customer Center prices for subscriptions from different Apple IDs (#7427) via Cesar de la Vega (@vegaro)
+
+### 🔄 Other Changes
+* Remove `@objc` from the new `confirmIn` purchase params (#7493) via Antonio Pallares (@ajpallares)
+* Add a transform entry point to the rules engine (#7486) via Antonio Pallares (@ajpallares)
+* Add nested variable rc.lower fixture case (#7484) via Antonio Pallares (@ajpallares)
+* [CI] Collapse the two check-api-changes jobs into one (#7476) via Antonio Pallares (@ajpallares)
+* Add rc.entries and rc.fromEntries custom operators (#7435) via Antonio Pallares (@ajpallares)
+* Raise an error for unresolved variables instead of degrading to null (#7460) via Antonio Pallares (@ajpallares)
+* Adopt shared Renovate config (#7485) via Álvaro Brey (@AlvaroBrey)
+* Add unwrapped rc.length fixture case (#7483) via Antonio Pallares (@ajpallares)
+* Add rc.split custom operator (#7473) via Antonio Pallares (@ajpallares)
+* Inject and refresh IAM tokens (#7440) via Dave DeLong (@davedelong)
+* Implement IAM Login Operations (#7439) via Dave DeLong (@davedelong)
+* HTTP Paths can change their absolute path based on IAM enablement (#7422) via Dave DeLong (@davedelong)
+* IAM Login part 2 (#7410) via Dave DeLong (@davedelong)
+* Fix Test run for watch and tvos (#7479) via Jacob Rakidzich (@JZDesign)
+* Bump sdks-common-config to 4.6.1 to cache the mise toolchain (#7478) via Antonio Pallares (@ajpallares)
+* Properly publish API modifications (no add/delete) in the SDK API feed (#7451) via Álvaro Brey (@AlvaroBrey)
+* Chore: Walk the workflow tree to broadcast prewarming data (#7420) via Jacob Rakidzich (@JZDesign)
+* Chore(Paywalls): Invoke the warmer from the coordinator (#7469) via Jacob Rakidzich (@JZDesign)
+* [CI] Build the nine platform swiftinterfaces in parallel (#6454) via Antonio Pallares (@ajpallares)
+* Fix(CI): Skip tests on unsupported os versions (#7477) via Jacob Rakidzich (@JZDesign)
+* Chore: Create WebBundleCachePrewarmer (#7429) via Jacob Rakidzich (@JZDesign)
+* Add rc.lower and rc.upper custom operators (#7436) via Antonio Pallares (@ajpallares)
+* Fix(CI): Correct type and add compiler check for old xcode version support (#7462) via Jacob Rakidzich (@JZDesign)
+* Chore: Signal purchases-ui on purchases configuration (#7407) via Jacob Rakidzich (@JZDesign)
+* Chore: Set up mechanism for WebView Caching (started with Clearing) (#7409) via Jacob Rakidzich (@JZDesign)
+* Rename the checkpoint event's `session_id` to `app_session_id` (#7459) via Cesar de la Vega (@vegaro)
+* Add rc.length operator for strings and arrays (#7437) via Antonio Pallares (@ajpallares)
+
 ## 5.85.0
 ## RevenueCat SDK
 ### ✨ New Features

Examples/CheckpointTester/CheckpointTester/Sources/ContentView.swift

@@ -22,6 +22,7 @@ struct ContentView: View {
     @ObservedObject var model: CheckpointDemoModel
     @ObservedObject var analyticsTracker: GlobalCheckpointAnalyticsTracker
     @StateObject private var customVariables = CustomVariables()
+    @State private var isSubscriberAttributeEditorPresented = false
 
     var body: some View {
         TabView {
@@ -40,6 +41,10 @@ struct ContentView: View {
                     Label("Listener", systemImage: "waveform.path.ecg")
                 }
         }
+        .sheet(isPresented: self.$isSubscriberAttributeEditorPresented) {
+            SubscriberAttributeEditor()
+                .presentationDetents([.medium])
+        }
         .alert(
             isPresented: Binding(
                 get: { self.model.outcomeAlert != nil },
@@ -156,6 +161,7 @@ struct ContentView: View {
 
             }
             .navigationTitle("Checkpoint Tester")
+            .subscriberAttributeToolbar(isPresented: self.$isSubscriberAttributeEditorPresented)
         }
     }
 
@@ -187,6 +193,7 @@ struct ContentView: View {
                 }
             }
             .navigationTitle("Custom variables")
+            .subscriberAttributeToolbar(isPresented: self.$isSubscriberAttributeEditorPresented)
         }
     }
 
@@ -219,6 +226,23 @@ struct ContentView: View {
                 }
             }
             .navigationTitle("Global Listener")
+            .subscriberAttributeToolbar(isPresented: self.$isSubscriberAttributeEditorPresented)
+        }
+    }
+
+}
+
+private extension View {
+
+    func subscriberAttributeToolbar(isPresented: Binding<Bool>) -> some View {
+        self.toolbar {
+            ToolbarItem(placement: .primaryAction) {
+                Button {
+                    isPresented.wrappedValue = true
+                } label: {
+                    Label("Set subscriber attribute", systemImage: "person.crop.circle.badge.plus")
+                }
+            }
         }
     }
 

Examples/CheckpointTester/CheckpointTester/Sources/SubscriberAttributeEditor.swift

@@ -0,0 +1,72 @@
+//
+//  Copyright RevenueCat Inc. All Rights Reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      https://opensource.org/licenses/MIT
+//
+//  SubscriberAttributeEditor.swift
+//
+//  Created by Rick van der Linden.
+//
+
+import RevenueCat
+import SwiftUI
+
+struct SubscriberAttributeEditor: View {
+
+    @Environment(\.dismiss) private var dismiss
+
+    @State private var key = ""
+    @State private var value = ""
+
+    var body: some View {
+        NavigationStack {
+            Form {
+                Section {
+                    TextField("Attribute key", text: self.$key)
+                        .textInputAutocapitalization(.never)
+                        .autocorrectionDisabled()
+                    TextField("Attribute value", text: self.$value)
+                        .textInputAutocapitalization(.never)
+                } footer: {
+                    Text(
+                        "Subscriber attributes are part of checkpoint rule evaluation. " +
+                        "Changing one here can change which rule matches on the next checkpoint."
+                    )
+                }
+            }
+            .navigationTitle("Subscriber attribute")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItemGroup(placement: .confirmationAction) {
+                    Button("Unset", role: .destructive) {
+                        self.updateAttribute(value: "")
+                    }
+                    .disabled(!self.hasKey)
+
+                    Button("Set") {
+                        self.updateAttribute(value: self.value)
+                    }
+                    .disabled(!self.hasKey)
+                }
+            }
+        }
+    }
+
+    private var trimmedKey: String {
+        return self.key.trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    private var hasKey: Bool {
+        return !self.trimmedKey.isEmpty
+    }
+
+    private func updateAttribute(value: String) {
+        Purchases.shared.attribution.setAttributes([self.trimmedKey: value])
+        self.dismiss()
+    }
+
+}

Examples/CheckpointTester/README.md

@@ -10,8 +10,13 @@ The app demonstrates how application behavior can respond to checkpoint results:
 - completing an onboarding flow regardless of the checkpoint result;
 - skipping a checkpoint when `CustomerInfo` already contains an active entitlement;
 - exercising deterministic no-action and error results;
+- setting or unsetting subscriber attributes used by checkpoint rules;
 - editing custom checkpoint properties and displaying a live analytics event log.
 
+Use the person button in any tab's navigation bar to set or unset one subscriber attribute. The attributes are
+part of the checkpoint rule evaluation scope, so this can change which rule matches without rebuilding the app.
+Unsetting passes an empty string, which is how the iOS SDK deletes an attribute.
+
 The generated app shares PaywallsTester's bundle identifier and `Products.storekit` configuration so it can use
 the same local in-app purchase products and RevenueCat project.
 

Examples/SampleCat/SampleCat.xcodeproj/project.pbxproj

@@ -531,7 +531,7 @@
 			repositoryURL = "https://github.com/RevenueCat/purchases-ios";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.85.0;
+				minimumVersion = 5.86.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Package.swift

@@ -127,7 +127,6 @@ let package = Package(
                 path: "RevenueCatUI",
                 resources: [
                     // Note: these have to match the values in RevenueCatUI.podspec
-                    .copy("Resources/background.jpg"),
                     .process("Resources/icons.xcassets"),
                     .process("Resources/Media.xcassets")
                 ],

Package@swift-5.8.swift

@@ -75,7 +75,6 @@ let package = Package(
                 dependencies: ["RevenueCat"],
                 path: "RevenueCatUI",
                 resources: [
-                    .copy("Resources/background.jpg"),
                     .process("Resources/icons.xcassets")
                 ]),
         .testTarget(name: "RevenueCatUITests",

RevenueCat.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RevenueCat"
-  s.version          = "5.86.0-SNAPSHOT"
+  s.version          = "5.87.0-SNAPSHOT"
   s.summary          = "Subscription and in-app-purchase backend service."
 
   s.description      = <<-DESC