Merge branch 'main' into pw-996/thread-owner

Author: JZDesign

.circleci/config.yml

@@ -42,14 +42,18 @@ version: 2.1
 orbs:
   android: circleci/android@3.1.0
   gcp-cli: circleci/gcp-cli@3.3.1
-  revenuecat: revenuecat/sdks-common-config@3.8.0
+  revenuecat: revenuecat/sdks-common-config@3.13.0
   codecov: codecov/codecov@3.2.4
 
 parameters:
   action:
     type: enum
     enum: [default, bump, paywall_tester_release, rct_tester_release, deploy_snapshot_release, update_paywall_templates, update_golden_requests_backend_integration_tests]
     default: default
+  paywall_tester_track:
+    type: enum
+    enum: [internal, alpha, beta, production]
+    default: alpha
 
 commands:
   install-sdkman:
@@ -263,6 +267,8 @@ jobs:
     shell: /bin/bash --login -o pipefail
     steps:
       - checkout
+      - revenuecat/setup-git-credentials
+      - revenuecat/trust-github-key
       - checkout-submodule:
           path: upstream/paywall-preview-resources
       - install-sdkman
@@ -388,7 +394,7 @@ jobs:
           command: sudo pip install awscli
       - run:
           name: Deploy to S3
-          command: aws s3 sync ~/project/docs/9.23.0-SNAPSHOT s3://purchases-docs/android/9.23.0-SNAPSHOT --delete
+          command: aws s3 sync ~/project/docs/9.24.0-SNAPSHOT s3://purchases-docs/android/9.24.0-SNAPSHOT --delete
       - run:
           name: Update index.html
           command: aws s3 cp ~/project/docs/index.html s3://purchases-docs/android/index.html
@@ -664,6 +670,8 @@ jobs:
     <<: *android-executor
     steps:
       - checkout
+      - revenuecat/setup-git-credentials
+      - revenuecat/trust-github-key
       - checkout-submodule:
           path: upstream/paywall-preview-resources
       - install-sdkman
@@ -767,6 +775,8 @@ jobs:
     <<: *android-executor
     steps:
       - checkout
+      - revenuecat/setup-git-credentials
+      - revenuecat/trust-github-key
       - checkout-submodule:
           path: upstream/paywall-preview-resources
       - attach_workspace:
@@ -781,7 +791,6 @@ jobs:
       - revenuecat/install-gem-unix-dependencies:
           cache-version: v1
       - android/restore_gradle_cache
-      - revenuecat/setup-git-credentials
       - run:
           name: Records new RevenueCat UI snapshots to become the new golden
           command: bundle exec fastlane android record_paparazzi_screenshots gradle_module:ui:revenuecatui
@@ -824,6 +833,8 @@ jobs:
     <<: *android-executor
     steps:
       - checkout
+      - revenuecat/setup-git-credentials
+      - revenuecat/trust-github-key
       - checkout-submodule:
           path: upstream/paywall-preview-resources
       - run:
@@ -833,7 +844,6 @@ jobs:
       - revenuecat/install-gem-unix-dependencies:
           cache-version: v1
       - android/restore_build_cache
-      - revenuecat/setup-git-credentials
       - run:
           name: Set GitHub token environment variable
           command: |
@@ -905,11 +915,12 @@ jobs:
       - image: cimg/ruby:3.2.0
     steps:
       - checkout
+      - revenuecat/setup-git-credentials
+      - revenuecat/trust-github-key
       - checkout-submodule:
           path: upstream/paywall-preview-resources
       - revenuecat/install-gem-unix-dependencies:
           cache-version: v1
-      - revenuecat/setup-git-credentials
       - run:
           name: Update paywall templates
           command: bundle exec fastlane android update_paywall_preview_resources_submodule
@@ -1170,7 +1181,7 @@ workflows:
       equal: [ paywall_tester_release, << pipeline.parameters.action >> ]
     jobs:
         - publish-paywall-tester-release:
-            track: "alpha"
+            track: << pipeline.parameters.paywall_tester_track >>
 
   manual-rct-tester-release:
     when:

.version

@@ -1 +1 @@
-9.23.0-SNAPSHOT
+9.24.0-SNAPSHOT

CHANGELOG.latest.md

@@ -1,9 +1,9 @@
 ## RevenueCatUI SDK
 ### Paywallv2
 #### 🐞 Bugfixes
-* Gracefully handle orphan `text_lid` instead of falling back to legacy paywall (#3101) via Cesar de la Vega (@vegaro)
+* Fix default value for `productChangeConfig` (#3153) via Cesar de la Vega (@vegaro)
 
 ### 🔄 Other Changes
-* Add PR labels to AGENTS.md (#3139) via Toni Rico (@tonidero)
-* Pass custom PurchaseLogic to PaywallActivityLauncher in RCTTester (#3137) via Toni Rico (@tonidero)
-* Add .claude/ to .gitignore and guardrails to AGENTS.md (#3123) via Facundo Menzella (@facumenzella)
+* Add elapsed_millis to FLUSH_COMPLETED debug event (#3184) via Toni Rico (@tonidero)
+* Add priority flush with rate limiting and queuing (#3179) via Rick (@rickvdl)
+* Bypass billing in preview mode (#3162) via Monika Mateska (@MonikaMateska)

CHANGELOG.md

@@ -1,3 +1,48 @@
+## 9.23.1
+## RevenueCatUI SDK
+### Paywallv2
+#### 🐞 Bugfixes
+* Fix default value for `productChangeConfig` (#3153) via Cesar de la Vega (@vegaro)
+
+### 🔄 Other Changes
+* Add elapsed_millis to FLUSH_COMPLETED debug event (#3184) via Toni Rico (@tonidero)
+* Add priority flush with rate limiting and queuing (#3179) via Rick (@rickvdl)
+* Bypass billing in preview mode (#3162) via Monika Mateska (@MonikaMateska)
+
+## 9.23.0
+## RevenueCat SDK
+### ✨ New Features
+* [CIA-5346] Appstack integration to android sdk (#3150) via Damian Rubio (@DamianRubio)
+* Create `PaywallPurchaseContext` to `PurchaseLogic` for product changes and offers (#3129) via Cesar de la Vega (@vegaro)
+* [EXTERNAL] feat: introduce awaitCanMakePayments (#3136) contributed by @TheRogue76 (#3141) via Toni Rico (@tonidero)
+### 🐞 Bugfixes
+* Fix missing uiPreviewMode mock in integration test (#3164) via Rick (@rickvdl)
+
+## RevenueCatUI SDK
+### 🐞 Bugfixes
+* Fix: Low res video only on first paywall view (#3120) via Jacob Rakidzich (@JZDesign)
+### Customer Center
+#### 🐞 Bugfixes
+* Fix cancellation URI in Customer Center (#3151) via Cesar de la Vega (@vegaro)
+### Paywallv2
+#### 🐞 Bugfixes
+* Fix PaywallResult.Cancelled for successful MY_APP purchases (#3138) via Toni Rico (@tonidero)
+
+### 🔄 Other Changes
+* Add internal trackCustomPaywallImpression method (#3167) via Rick (@rickvdl)
+* Bump fastlane-plugin-revenuecat_internal from `8cd957f` to `f5c099b` (#3176) via dependabot[bot] (@dependabot[bot])
+* Update sdks-common-config orb to 3.13.0 (#3173) via Antonio Pallares (@ajpallares)
+* Add FLUSH_COMPLETED and FLUSH_SKIPPED_NO_EVENTS debug events (#3166) via Toni Rico (@tonidero)
+* Add `paywall_tester_track` parameter to `manual-paywall-tester-release` (#3169) via Cesar de la Vega (@vegaro)
+* Return mock CustomerInfo in preview mode (#3161) via Monika Mateska (@MonikaMateska)
+* Disable attribution, diagnostics, and caching in preview mode (#3160) via Monika Mateska (@MonikaMateska)
+* Add X-UI-Preview-Mode header to HTTP requests in preview mode (#3159) via Monika Mateska (@MonikaMateska)
+* Paywall Tester - Helper to clear paywall file cache (#3154) via Jacob Rakidzich (@JZDesign)
+* Use fixed user ID and block login/logout in preview mode (#3158) via Monika Mateska (@MonikaMateska)
+* Bump fastlane-plugin-revenuecat_internal from `afc9219` to `ea6276c` (#3122) via dependabot[bot] (@dependabot[bot])
+* Bump fastlane from 2.232.1 to 2.232.2 (#3155) via dependabot[bot] (@dependabot[bot])
+* Add uiPreviewMode flag to DangerousSettings (#3144) via Monika Mateska (@MonikaMateska)
+
 ## 9.22.2
 ## RevenueCatUI SDK
 ### Paywallv2

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/RevenueCat/fastlane-plugin-revenuecat_internal
-  revision: 8cd957f15481f738116cbde803c307c9e3b838a0
+  revision: f5c099b657d36024ac98ab89b004a5d2adb6c891
   branch: main
   specs:
     fastlane-plugin-revenuecat_internal (0.1.0)
@@ -236,7 +236,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2026.0224)
+    mime-types-data (3.2026.0303)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)

api-tester/src/defaults/java/com/revenuecat/apitester/java/PurchasesAPI.java

@@ -186,6 +186,19 @@ static void checkSetAppsFlyerAttributionData(final Purchases purchases) {
         purchases.setAppsFlyerConversionData(mapStringInt);
     }
 
+    static void checkSetAppstackAttributionParams(final Purchases purchases) {
+        final SyncAttributesAndOfferingsCallback callback = new SyncAttributesAndOfferingsCallback() {
+            @Override
+            public void onSuccess(@NonNull Offerings offerings) {}
+
+            @Override
+            public void onError(@NonNull PurchasesError error) {}
+        };
+
+        Map<String, String> mapStringString = new HashMap<>();
+        purchases.setAppstackAttributionParams(mapStringString, callback);
+    }
+
     static void checkConfiguration(final Context context,
                                    final ExecutorService executorService,
                                    final PurchasesConfiguration purchasesConfiguration) {

api-tester/src/defaults/kotlin/com/revenuecat/apitester/kotlin/PurchasesAPI.kt

@@ -25,6 +25,7 @@ import com.revenuecat.purchases.awaitLogIn
 import com.revenuecat.purchases.awaitLogOut
 import com.revenuecat.purchases.awaitRestore
 import com.revenuecat.purchases.awaitRestoreResult
+import com.revenuecat.purchases.awaitSetAppstackAttributionParams
 import com.revenuecat.purchases.awaitStorefrontLocale
 import com.revenuecat.purchases.awaitSyncAttributesAndOfferingsIfNeeded
 import com.revenuecat.purchases.awaitSyncPurchases
@@ -216,6 +217,8 @@ private class PurchasesAPI {
         var customerCenterConfigData: CustomerCenterConfigData = purchases.awaitCustomerCenterConfigData()
         val getVirtualCurrenciesResult: VirtualCurrencies = purchases.awaitGetVirtualCurrencies()
         val storefrontLocale: Locale = purchases.awaitStorefrontLocale()
+        var offeringsWithAppstackTargeting: Offerings =
+            purchases.awaitSetAppstackAttributionParams(mapOf("key" to "value"))
     }
 
     fun check(purchases: Purchases, attributes: Map<String, String>) {
@@ -288,6 +291,17 @@ private class PurchasesAPI {
         purchases.setAppsFlyerConversionData(mapNullableKeyNullableInt)
     }
 
+    @Suppress("UNUSED_PARAMETER")
+    fun checkSetAppstackAttributionParams(purchases: Purchases) {
+        val callback = object : SyncAttributesAndOfferingsCallback {
+            override fun onSuccess(offerings: Offerings) {}
+            override fun onError(error: PurchasesError) {}
+        }
+
+        val mapStringString: Map<String, String> = emptyMap()
+        purchases.setAppstackAttributionParams(mapStringString, callback)
+    }
+
     @Suppress("ForbiddenComment")
     fun checkConfiguration(
         purchasesConfiguration: PurchasesConfiguration,

api-tester/src/defaults/kotlin/com/revenuecat/apitester/kotlin/revenuecatui/CustomVariableValueAPI.kt

@@ -2,26 +2,38 @@ package com.revenuecat.apitester.kotlin.revenuecatui
 
 import com.revenuecat.purchases.ui.revenuecatui.CustomVariableValue
 
-@Suppress("unused", "UNUSED_VARIABLE")
+@Suppress("unused", "UNUSED_VARIABLE", "MagicNumber")
 private class CustomVariableValueAPI {
 
-    fun check() {
-        // String type is public
+    fun checkString() {
         val stringValue: CustomVariableValue = CustomVariableValue.String("test")
         val stringInnerValue: String = stringValue.stringValue
-
-        // Access the underlying value
         val underlyingString: String = (stringValue as CustomVariableValue.String).value
     }
 
+    fun checkNumber() {
+        val fromDouble: CustomVariableValue = CustomVariableValue.Number(9.99)
+        val fromInt: CustomVariableValue = CustomVariableValue.Number(42)
+        val fromLong: CustomVariableValue = CustomVariableValue.Number(123L)
+        val fromFloat: CustomVariableValue = CustomVariableValue.Number(3.14f)
+        val underlyingDouble: Double = (fromDouble as CustomVariableValue.Number).value
+        val stringRepresentation: String = fromDouble.stringValue
+    }
+
+    fun checkBoolean() {
+        val boolTrue: CustomVariableValue = CustomVariableValue.Boolean(true)
+        val boolFalse: CustomVariableValue = CustomVariableValue.Boolean(false)
+        val underlyingBool: Boolean = (boolTrue as CustomVariableValue.Boolean).value
+        val stringRepresentation: String = boolTrue.stringValue
+    }
+
     fun checkMap() {
-        // Typical usage with map
         val customVariables: Map<String, CustomVariableValue> = mapOf(
             "player_name" to CustomVariableValue.String("John"),
-            "app_name" to CustomVariableValue.String("My App"),
+            "level" to CustomVariableValue.Number(42),
+            "is_premium" to CustomVariableValue.Boolean(true),
         )
 
-        // Access values
         for ((key, value) in customVariables) {
             val stringRepresentation: String = value.stringValue
         }

config/detekt/detekt-baseline.xml

@@ -164,6 +164,7 @@
     <ID>TooManyFunctions:HTTPClient.kt$HTTPClient</ID>
     <ID>TooManyFunctions:Purchases.kt$Purchases : LifecycleDelegate</ID>
     <ID>TooManyFunctions:SubscriberAttributesCache.kt$SubscriberAttributesCache</ID>
+    <ID>TooManyFunctions:coroutinesExtensions.kt$com.revenuecat.purchases.coroutinesExtensions.kt</ID>
     <ID>TooManyFunctions:listenerConversions.kt$com.revenuecat.purchases.listenerConversions.kt</ID>
     <ID>UnusedParameter:SampleWeatherData.kt$SampleWeatherData.Companion$environment: Environment</ID>
     <ID>ViewModelForwarding:AppInfoScreen.kt$LoginDialog(viewModel) { showLogInDialog = false }</ID>

docs/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv="refresh" content="0; url=https://sdk.revenuecat.com/android/9.22.2/index.html" />
+    <meta http-equiv="refresh" content="0; url=https://sdk.revenuecat.com/android/9.23.1/index.html" />
 </head>
 <body>
 </body>