Increase targetSdkVersion to 36 by tonidero · Pull Request #2446 · RevenueCat/purchases-android

tonidero · 2025-06-16T12:28:30Z

Description

This increases the target and compile Sdk versions of our SDKs and apps to android 16 (36). https://developer.android.com/about/versions/16/behavior-changes-16

Note

Medium Risk
Raising compileSdk/targetSdk and updating robolectric/paparazzi can surface behavior changes and test/runtime regressions; most code changes are build/test scaffolding rather than core SDK logic.

Overview
Updates the project and example apps to compile/target Android SDK 36, centralizing SDK version numbers in gradle/libs.versions.toml and removing the old top-level buildscript extra version fields.

Refreshes test/tooling dependencies (notably robolectric, espresso, paparazzi, and AndroidX test libs) and applies required follow-ups: new Proguard -dontwarn rules for integration tests, adds robolectric.properties to pin sdk for Paparazzi, and hardens a Compose UI test by waiting for the error snackbar to clear before retrying.

Includes small Compose sample adjustments for newer Material3 APIs (e.g., TopAppBar usage) and removes status-bar side effects from example themes; backend integration test golden request headers are updated to reflect platform version 36.

^{Written by Cursor Bugbot for commit 4ac3db3. This will update automatically on new commits. Configure here.}

emerge-tools · 2025-06-16T12:44:42Z

📸 Snapshot Test

181 modified, 7 added, 7 removed, 394 unchanged

Name	Added	Removed	Modified	Renamed	Unchanged	Errored	Approval
TestPurchasesUIAndroidCompatibility Paparazzi com.revenuecat.testpurchasesuiandroidcompatibility.paparazzi	7	7	181	0	69	0	⏳ Needs approval
TestPurchasesUIAndroidCompatibility com.revenuecat.testpurchasesuiandroidcompatibility	0	0	0	0	325	0	N/A

🛸 Powered by Emerge Tools

tonidero · 2025-12-02T12:10:09Z

+    // This is needed because of an incompatibility between Robolectric and Paparazzi:
+    // https://github.com/cashapp/paparazzi/issues/1979
+    forkEvery = 1
+    maxParallelForks = 5


Honestly I'm not in love with this and it does cause tests to be noticeable slower... but the alternative is to split the Paparazzi tests (right now we have 2 classes) into a separate module, and we're using internal APIs, so that isn't straightforward.

ajpallares

I think it makes sense, but some things escape my expertise... will leave approval to someone with more knowledge 🙏

codecov · 2025-12-03T12:10:28Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.47%. Comparing base (a485da9) to head (4ac3db3).
⚠️ Report is 8 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2446   +/-   ##
=======================================
  Coverage   79.47%   79.47%           
=======================================
  Files         357      357           
  Lines       14351    14351           
  Branches     1960     1960           
=======================================
  Hits        11406    11406           
  Misses       2141     2141           
  Partials      804      804

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

This reverts commit df6fa9d.

This reverts commit 2002cf6.

tonidero · 2025-12-18T14:15:19Z

    if (!view.isInEditMode) {
        SideEffect {
            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()


This was using a deprecated API in Android 36. Since it's only used for previews, and it shouldn't really matter, I just removed it.

…ncrease-target-sdk-version-36

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

cursor · 2026-03-31T14:36:36Z

                },
-                backgroundColor = Color.Transparent,
-                elevation = 0.dp,
+                modifier = Modifier.background(Color.Transparent),


Transparent background not applied to Material3 TopAppBar

Low Severity

Modifier.background(Color.Transparent) does not replicate the old Material TopAppBar's backgroundColor = Color.Transparent behavior. Material3's TopAppBar renders its own container color (defaulting to the theme surface color) on top of the modifier background, so the bar won't actually be transparent. The colors parameter with TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent) is the correct way to achieve this in Material3.

tonidero · 2026-03-31T15:39:07Z

@@ -0,0 +1 @@
+sdk=34


This is another workaround someone mentioned. Basically run robolectric tests in a lower target to avoid the conflicts with Paparazzi. Seems to work fine and probably better than the previous workaround (run each test class in a different JVM which made it super slow)

@JayShortway in case you have any thoughts on the new approach for making this work. Planning to merge this next week as well.

I think this is fine, indeed much better than creating a new JVM for each. Might be good to add a comment in the file explaining why we have that?

Did in 4ac3db3 :)

tonidero · 2026-03-31T15:40:26Z

        ).performClick()

+        // Wait for error snackbar to appear and disappear so it doesn't overlay the button
+        composeTestRule.waitUntilDoesNotExist(


I had to add this to make the test pass. I believe with the library updates, the snackbar was interfering with the second touch. Until the snackbar went away, we couldn't tap again. I didn't want to modify the behavior of the feature, so I added this to the test. Lmk what you think 🙏

This reverts commit 9703693.

tonidero · 2026-04-01T07:28:08Z

I gave it another shoot with another workaround for the issues we were seeing, and seems to be working. Seems the snapshots changes are mostly due to shadows, likely they were modified with the android runtime. Would appreciate another look! 🙇 @RevenueCat/coresdk @vegaro

vegaro

Almost there! Thanks for persevering

vegaro · 2026-04-01T08:20:49Z

just noting that looks like the regular MagicWeather is still in compileSdk = 34

Indeed... We do need to fix the UI a bit there to support edge to edge (which is mandatory when targeting 36). Maybe we can leave it for later? Good to bring it up though!

sure no problem! just making sure you knew and you hadn't missed it there

vegaro · 2026-04-01T08:24:36Z

 #-renamesourcefileattribute SourceFile
 -keep class com.revenuecat.purchases.** { *; }
+-dontwarn javax.lang.model.element.Modifier
+-dontwarn com.google.errorprone.annotations.IncompatibleModifiers


I asume these are needed because of RoboElectric

Indeed. I only run into issues with this for this integration tests module, which was weird for me... I didn't run into issues when running instrumentation tests in release mode in the purchases module, so I added these here. But without the robolectric bump, these are not needed, so I don't think it would affect customers

Sorry I actually meant espresso. With the bump of espresso, this became necessary.

@tonidero

## RevenueCat SDK > [!WARNING] > If you don't have any login system in your app, please make sure your one-time purchase products have been correctly configured in the RevenueCat dashboard as either consumable or non-consumable. If they're incorr as consumables, RevenueCat will consume these purchases. This means that users won't be able to restore them from version 10.0.0 onward. > Non-consumables are products that are meant to be bought only once, for example, lifetime subscriptions. Please see more information in our [docs](https://www.revenuecat.com/docs/known-store-issues/play-billing-library/restore-consumable-purchases-bc8) ### 💥 Breaking Changes This release updates to Billing Library 8.3.0 with min SDK supported of Android 6 (API 23), previously min was 21. It also removes a previous workaround used to be able to restore consumed one time products which is not available anymore. * Update to Billing Library 8.3.0 (#3256) via Toni Rico (@tonidero) * Revert AIDL workaround for consumed consumables (#3255) via Toni Rico (@tonidero) ### 🔄 Other Changes * Bump fastlane-plugin-revenuecat_internal from `6289be1` to `ceecf91` (#3301) via dependabot[bot] (@dependabot[bot]) * Increase targetSdkVersion to 36 (#2446) via Toni Rico (@tonidero) * [AUTOMATIC] Update golden test files for backend integration tests (#3302) via RevenueCat Git Bot (@RCGitBot) * Bump fastlane-plugin-revenuecat_internal from `5d6e93f` to `6289be1` (#3299) via dependabot[bot] (@dependabot[bot]) * Bump fastlane-plugin-revenuecat_internal from `f11fe40` to `5d6e93f` (#3294) via dependabot[bot] (@dependabot[bot])  --- > [!NOTE] > **Medium Risk** > Primarily a release/version bump, but it ships documented breaking changes (minSdk 23 via Billing Library 8.3.0 and removal of a restore workaround) that can affect app compatibility and restore behavior. > > **Overview** > Bumps the project from `9.30.0-SNAPSHOT` to `10.0.0` across build metadata (`.version`, `gradle.properties`, `Config.frameworkVersion`) and sample/test app dependency pins. > > Updates release documentation: adds `10.0.0` entries to `CHANGELOG.md`/`CHANGELOG.latest.md` (including a warning and breaking-change notes) and introduces `migrations/v10-MIGRATION.md`. > > Adjusts docs publishing to serve `10.0.0` by updating `docs/index.html` redirect and the CircleCI S3 sync path in `docs-deploy`. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit d18f479. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup>

tonidero added the pr:other label Jun 16, 2025

tonidero commented Jun 16, 2025

View reviewed changes

Comment thread ...ustomEntitlementComputationSample/app/src/main/java/com/revenuecat/sample/main/MainScreen.kt

Comment thread ...CustomEntitlementComputationSample/app/src/main/java/com/revenuecat/sample/ui/theme/Theme.kt

This comment was marked as outdated.

Sign in to view

tonidero added 2 commits December 2, 2025 12:59

Increase targetVersion and compileVersion to 36

4cd4868

Fix integration tests SecurityException when running in Android > 33

21b2790

tonidero force-pushed the increase-target-sdk-version-36 branch from d6c509c to 21b2790 Compare December 2, 2025 12:06

Add comment

b59c285

tonidero commented Dec 2, 2025

View reviewed changes

Fix CEC sample app insets

e65bddc

tonidero commented Dec 2, 2025

View reviewed changes

Comment thread gradle/libs.versions.toml

tonidero marked this pull request as ready for review December 2, 2025 12:22

tonidero requested a review from a team as a code owner December 2, 2025 12:22

tonidero requested a review from a team December 2, 2025 12:22

ajpallares reviewed Dec 2, 2025

View reviewed changes

tonidero requested review from JayShortway and vegaro December 3, 2025 08:47

vegaro approved these changes Dec 3, 2025

View reviewed changes

tonidero added 2 commits December 3, 2025 12:35

Fix parsing of templates

08f6c26

Update backend integration tests snapshots

fd2d315

tonidero and others added 3 commits December 3, 2025 16:11

Test: Verify changes in paparazzi snapshots

2002cf6

Merge branch 'main' into increase-target-sdk-version-36

be235c9

Remove deprecated property from CustomerCenterPreviewTheme

ed712e7

tonidero requested a review from a team as a code owner December 11, 2025 16:08

Test 2: Verifying snapshots

df6fa9d

tonidero force-pushed the increase-target-sdk-version-36 branch from a87263b to df6fa9d Compare December 11, 2025 16:14

tonidero added 3 commits December 11, 2025 17:29

Update golden

7d0499f

Revert "Test 2: Verifying snapshots"

e089ee0

This reverts commit df6fa9d.

Revert "Test: Verify changes in paparazzi snapshots"

ed85eb4

This reverts commit 2002cf6.

tonidero and others added 2 commits December 18, 2025 15:12

Merge branch 'main' into increase-target-sdk-version-36

6eb11e8

Fix detekt

95c5dfd

tonidero commented Dec 18, 2025

View reviewed changes

tonidero added 2 commits March 31, 2026 16:31

Merge branch 'main' of github.com:RevenueCat/purchases-android into i…

80f1c50

…ncrease-target-sdk-version-36

Revert workaround that split tests into different runtimes

6adb989

cursor Bot reviewed Mar 31, 2026

View reviewed changes

tonidero added 3 commits March 31, 2026 17:21

Fix tests by lowering robolectric target SDK to 34

72eb902

Fix CreateSupportTicketViewTest

6a148e6

Bump to latest paparazzi alpha

9703693

tonidero commented Mar 31, 2026

View reviewed changes

tonidero added 2 commits March 31, 2026 17:59

Revert "Bump to latest paparazzi alpha"

0fdad0e

This reverts commit 9703693.

Add rules to integration tests proguard

b8b99d8

tonidero requested review from a team, ajpallares and vegaro April 1, 2026 07:28

vegaro reviewed Apr 1, 2026

View reviewed changes

tonidero added 2 commits April 1, 2026 12:49

Remove deprecated API in MagicWeatherCompose

07338b2

Add note for paparazzi version

9bff852

tonidero requested a review from vegaro April 1, 2026 11:01

tonidero added 2 commits April 1, 2026 13:48

Remove unused imports

7060915

Add note in proguard rules

fbe7cc0

vegaro approved these changes Apr 1, 2026

View reviewed changes

Add note for new workaround

4ac3db3

tonidero added this pull request to the merge queue Apr 7, 2026

Merged via the queue into main with commit 9785aff Apr 7, 2026
39 of 40 checks passed

tonidero deleted the increase-target-sdk-version-36 branch April 7, 2026 17:05

tonidero mentioned this pull request Apr 7, 2026

Release/10.0.0 #3303

Merged

		@@ -0,0 +1 @@
		sdk=34

Uh oh!

Conversation

tonidero commented Jun 16, 2025 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

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

Uh oh!

📸 Snapshot Test

181 modified, 7 added, 7 removed, 394 unchanged

Uh oh!

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ajpallares left a comment

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot Mar 31, 2026

Choose a reason for hiding this comment

Transparent background not applied to Material3 TopAppBar

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tonidero commented Apr 1, 2026

Uh oh!

vegaro left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

tonidero commented Jun 16, 2025 •

edited by cursor Bot

Loading

emerge-tools Bot commented Jun 16, 2025 •

edited

Loading

codecov Bot commented Dec 3, 2025 •

edited

Loading