Upgrade Android Gradle Plugin and Compose #4848

geekygecko · 2025-12-15T00:36:56Z

Description

Android Studio was prompting to use the upgrade assistant for the Android Gradle Plugin. This change upgrades this and the last Compose version.

There were some lint issues. I have updated some of the classes but also run ./gradlew updateLintBaselineRelease for more to be done in future PRs.

Release Notes

Android Gradle Plugin
Compose
- "Our internal scroll benchmarks show that Compose now matches the performance you would see if using Views"
- "a fundamental change to how the Compose runtime schedules work, designed to significantly reduce jank during heavy UI workloads."

Testing Instructions

Test in the same way you normally would with a Dependabot update.

Checklist

If this is a user-facing change, I have added an entry in CHANGELOG.md
Ensure the linter passes (./gradlew spotlessApply to automatically apply formatting/linting)
I have considered whether it makes sense to add tests for my changes
All strings that need to be localized are in modules/services/localization/src/main/res/values/strings.xml
Any jetpack compose components I added or changed are covered by compose previews
I have updated (or requested that someone edit) the spreadsheet to reflect any new or changed analytics.

I have tested any UI changes...

with different themes
with a landscape orientation
with the device set to have a large display and font size
for accessibility with TalkBack

Copilot

Pull request overview

This PR upgrades two key Android development dependencies to their latest versions: the Android Gradle Plugin (AGP) from 8.13.1 to 8.13.2, and the Compose BOM from 2025.11.01 to 2025.12.00. The Compose update includes significant performance improvements, with internal benchmarks showing scroll performance now matching Views and reduced jank during heavy UI workloads.

Key Changes

Android Gradle Plugin version bumped to 8.13.2 (bug fixes release)
Compose BOM upgraded to 2025.12.00 (December 2025 release with performance improvements)

wpmobilebot · 2025-12-15T00:44:24Z

Project manifest changes for app

The following changes in the app's merged AndroidManifest.xml file were detected (build variant: release):

--- ./build/reports/diff_manifest/app/release/base_manifest.txt	2026-01-05 08:58:29.555384971 +0000
+++ ./build/reports/diff_manifest/app/release/head_manifest.txt	2026-01-05 08:59:23.435457937 +0000
@@ -1214,6 +1214,11 @@
             android:name="androidx.glance.appwidget.GlanceRemoteViewsService"
             android:exported="true"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <activity
+            android:name="androidx.compose.ui.tooling.PreviewActivity"
+            android:exported="true" />
+
         <service
             android:name="androidx.work.impl.background.systemjob.SystemJobService"
             android:directBootAware="false"
@@ -1246,10 +1251,6 @@
             </intent-filter>
         </receiver>
 
-        <activity
-            android:name="androidx.compose.ui.tooling.PreviewActivity"
-            android:exported="true" />
-
         <service
             android:name="androidx.core.widget.RemoteViewsCompatService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />

Go to https://buildkite.com/automattic/pocket-casts-android/builds/15015/canvas?sid=019b8d5d-03d8-4167-94cc-5d2acbec2c19, click on the Artifacts tab and audit the files.

wpmobilebot · 2025-12-15T00:44:34Z

Project dependencies changes

list

+ New Dependencies
androidx.compose.runtime:runtime-retain:1.10.0
androidx.compose.runtime:runtime-retain-android:1.10.0
androidx.compose.runtime:runtime-rxjava2-android:1.10.0

! Upgraded Dependencies
androidx.compose.animation:animation:1.10.0, (changed from 1.9.5)
androidx.compose.animation:animation-android:1.10.0, (changed from 1.9.5)
androidx.compose.animation:animation-core:1.10.0, (changed from 1.9.5)
androidx.compose.animation:animation-core-android:1.10.0, (changed from 1.9.5)
androidx.compose.animation:animation-graphics:1.10.0, (changed from 1.9.5)
androidx.compose.animation:animation-graphics-android:1.10.0, (changed from 1.9.5)
androidx.compose.foundation:foundation:1.10.0, (changed from 1.9.5)
androidx.compose.foundation:foundation-android:1.10.0, (changed from 1.9.5)
androidx.compose.foundation:foundation-layout:1.10.0, (changed from 1.9.5)
androidx.compose.foundation:foundation-layout-android:1.10.0, (changed from 1.9.5)
androidx.compose.material:material:1.10.0, (changed from 1.9.5)
androidx.compose.material:material-android:1.10.0, (changed from 1.9.5)
androidx.compose.material:material-ripple:1.10.0, (changed from 1.9.5)
androidx.compose.material:material-ripple-android:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-android:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-annotation:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-annotation-android:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-livedata:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-rxjava2:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-saveable:1.10.0, (changed from 1.9.5)
androidx.compose.runtime:runtime-saveable-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-geometry:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-geometry-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-graphics:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-graphics-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-text:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-text-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-tooling:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-tooling-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-tooling-data:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-tooling-data-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-tooling-preview:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-tooling-preview-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-unit:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-unit-android:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-util:1.10.0, (changed from 1.9.5)
androidx.compose.ui:ui-util-android:1.10.0, (changed from 1.9.5)
androidx.compose:compose-bom:2025.12.01, (changed from 2025.11.01)
androidx.transition:transition:1.6.0, (changed from 1.5.0)
androidx.window:window:1.5.0, (changed from 1.4.0)
androidx.window:window-core:1.5.0, (changed from 1.4.0)
androidx.window:window-core-android:1.5.0, (changed from 1.4.0)
org.jetbrains.androidx.savedstate:savedstate:1.3.5, (changed from 1.3.4)
org.jetbrains.androidx.savedstate:savedstate-compose:1.3.5, (changed from 1.3.4)
org.jetbrains.compose.runtime:runtime:1.9.2, (changed from 1.9.1)
org.jetbrains.compose.runtime:runtime-saveable:1.9.2, (changed from 1.9.0)

⚠️ Project dependencies tree is too large. View it in Buildkite artifacts

Copilot

Pull request overview

Copilot reviewed 3 out of 4 changed files in this pull request and generated 1 comment.

Copilot · 2025-12-15T04:10:24Z

config/gradle/gradle_build_scan.gradle

+// Temporarily disabling Develocity to address CI failures under the assumption they are due to an expired trial.
+// See https://a8c.slack.com/archives/CC7L49W13/p1765762270890589
+if (gradle.ext["develocityToken"] != null) {


The comment states "Temporarily disabling Develocity" but the code logic enables Develocity when develocityToken is not null. If the intent is to disable Develocity, the condition should be inverted or the entire block should be commented out. If the intent is to make it conditional on having a valid token, the comment should be updated to reflect this (e.g., "Only enable Develocity when a valid token is available").

Copilot

Pull request overview

Copilot reviewed 3 out of 4 changed files in this pull request and generated 2 comments.

config/gradle/gradle_build_scan.gradle

Copilot · 2025-12-15T04:42:32Z

config/gradle/gradle_build_scan.gradle

+            termsOfUseUrl = 'https://gradle.com/terms-of-service'
+            termsOfUseAgree = 'yes'
+            tag 'CI'
            uploadInBackground = false


The removal of the else-if branch that handled the "measureBuildsEnabled" configuration appears to be unintentional. This branch provided hostname and IP address obfuscation for local builds when build measurement was enabled. Without this, local developers who have enabled build measurement would lose privacy protections that were previously in place.

Suggested change

uploadInBackground = false

uploadInBackground = false

} else if (gradle.hasProperty("measureBuildsEnabled") && gradle.ext["measureBuildsEnabled"]) {

// Obfuscate hostname and IP address for local builds with build measurement enabled

obfuscation {

hostname = true

ipAddresses = true

}

@wzieba in making this change, I assumed that the obfuscation was part of the Develocity 360 trial. If not, then I'll restore this as well.

dangermattic · 2025-12-15T04:49:47Z

	2 Warnings
⚠️	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	This PR is assigned to the milestone 8.3. The due date for this milestone has already passed. Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

geekygecko · 2025-12-15T04:51:26Z

app/src/androidTest/java/au/com/shiftyjelly/pocketcasts/OnboardingFlowComposableTest.kt

    fun setupAppNavHost(
        flow: OnboardingFlow,
-        signInState: SignInState = mock(),
+        signInState: SignInState = SignInState.SignedIn(email = "", subscription = null),


This fixes the following test issue.

OnboardingFlowComposableTest.kt:61: Error: 'au.com.shiftyjelly.pocketcasts.models.type.SignInState' is a sealed type and has a restricted type hierarchy, use a subtype instead. [DoNotMockSealedClass from org.wordpress.android.lint] signInState: SignInState = mock(), ~~~~~~

geekygecko · 2025-12-15T04:52:26Z

automotive/src/main/res/layout/fragment_automotive_settings.xml

            app:layout_constraintTop_toTopOf="parent" />

-        <fragment
+        <androidx.fragment.app.FragmentContainerView


This fixes the following lint issue:

Warning: Replace the <fragment> tag with FragmentContainerView.

geekygecko · 2025-12-15T04:55:14Z

modules/features/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountHeader.kt

+                            stringResource(LR.string.profile_plus_expires, expiryDate)
+                        },
+                    ),
+                )


This fixes the lint issues:

Querying resource values using LocalContext.current Toggle info

It recommends using stringResource, which gives the next issue:

@Composable invocations can only happen from the context of a @Composable function

So I had to move the remember from around the stringResource calls.

geekygecko · 2025-12-15T04:56:01Z

scripts/themes/generate_kotlin.rb

                           'Color.WHITE'
                         elsif words[3].start_with?('#')
-                           "Color.parseColor(\"#{words[3]}\")"
+                           "\"#{words[3]}\".toColorInt()"


Fixes the following line issue:

Warning: Use the KTX extension function String.toColorInt instead?

geekygecko · 2025-12-15T04:56:57Z

...lin/au/com/shiftyjelly/pocketcasts/wear/ui/component/horologist/ProgressStateHolderStyled.kt

    private val timestampProvider: TimestampProvider,
 ) {
-    private val actual = mutableStateOf(initial)
+    private val actual = mutableFloatStateOf(initial)


This fixes the lint issue:

Hint: Prefer mutableFloatStateOf instead of mutableStateOf [AutoboxingStateCreation from androidx.compose.runtime]

Copilot

Pull request overview

Copilot reviewed 15 out of 18 changed files in this pull request and generated no new comments.

mokagio · 2025-12-15T05:20:01Z

.configure

  "project_name": "pocketcasts-android",
  "branch": "trunk",
-  "pinned_hash": "c548b505ffe4342e31be28edc92c5a058fbf1410",
+  "pinned_hash": "29f04c18842c391363c5129b59b8a32973319611",


This is an harmless leftover from my attempts to address the Develocity issue.

geekygecko · 2026-01-05T08:55:11Z

@sztomek can I please get a review of this PR. The Gradle plugin has already been upgraded as part of a Dependabot PR.

Copilot

Pull request overview

Copilot reviewed 15 out of 18 changed files in this pull request and generated no new comments.

wzieba

Thanks for working on it @geekygecko ! I see that lint-baseline.xml grew a lot - have you maybe set ignoreWarnings = true when regenerating it? If not, could you please do this again with the option?

pocket-casts-android/build.gradle.kts

Lines 208 to 209 in e68d1d5

    
           // Uncomment this when regenerating baseline files 
        
           // ignoreWarnings = true

Keeping warnings out of the baseline is preferable, so we have a better observability on them.

geekygecko added this to the 8.3 milestone Dec 15, 2025

Copilot AI review requested due to automatic review settings December 15, 2025 00:36

geekygecko added [Type] Tech Debt Involving upgrades or refactoring to maintain or enhance the codebase. [Area] Dependencies Pull requests that update a dependency file labels Dec 15, 2025

geekygecko marked this pull request as ready for review December 15, 2025 00:37

geekygecko requested a review from a team as a code owner December 15, 2025 00:37

geekygecko requested review from sztomek and removed request for a team December 15, 2025 00:37

Copilot started reviewing on behalf of geekygecko December 15, 2025 00:37 View session

Copilot AI reviewed Dec 15, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 15, 2025 04:06

Copilot started reviewing on behalf of mokagio December 15, 2025 04:07 View session

Copilot AI reviewed Dec 15, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 15, 2025 04:39

Copilot started reviewing on behalf of mokagio December 15, 2025 04:40 View session

Copilot AI reviewed Dec 15, 2025

View reviewed changes

geekygecko commented Dec 15, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 15, 2025 05:16

Copilot started reviewing on behalf of geekygecko December 15, 2025 05:16 View session

Copilot AI reviewed Dec 15, 2025

View reviewed changes

mokagio requested a review from wzieba December 15, 2025 05:19

mokagio reviewed Dec 15, 2025

View reviewed changes

geekygecko mentioned this pull request Dec 16, 2025

Bump android-gradle-plugin from 8.13.1 to 8.13.2 #4849

Merged

geekygecko requested a review from mokagio December 17, 2025 11:08

geekygecko and others added 8 commits January 5, 2026 19:23

Upgrade Android Gradle Plugin and Compose

aa43ce5

Fix tests and some lint errors.

43ad89d

Update secret.properties

17fd80c

Only run develocity upload if a token is given

b975cd8

Add an else branch to the develocity config

a4fcc48

Restore publishing build scan, just not to our own instance

c8bc228

Fixing Ruby lint issues

d16d4cb

Upgrade Compose again

0f1a43c

Copilot AI review requested due to automatic review settings January 5, 2026 08:53

geekygecko force-pushed the task/upgrade-gradle-plugin-compose branch from 7b51108 to 0f1a43c Compare January 5, 2026 08:53

Copilot started reviewing on behalf of geekygecko January 5, 2026 08:54 View session

Copilot AI reviewed Jan 5, 2026

View reviewed changes

wzieba reviewed Jan 5, 2026

View reviewed changes

-            uploadInBackground = false
+            uploadInBackground = false
+        } else if (gradle.hasProperty("measureBuildsEnabled") && gradle.ext["measureBuildsEnabled"]) {
+            // Obfuscate hostname and IP address for local builds with build measurement enabled
+            obfuscation {
+                hostname = true
+                ipAddresses = true
+            }

	// Uncomment this when regenerating baseline files
	// ignoreWarnings = true

Upgrade Android Gradle Plugin and Compose #4848

Are you sure you want to change the base?

Upgrade Android Gradle Plugin and Compose #4848

Conversation

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

Uh oh!

Description

Testing Instructions

Checklist

I have tested any UI changes...

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Uh oh!

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

Uh oh!

Project manifest changes for app

Uh oh!

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

Uh oh!

Project dependencies changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

mokagio Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

geekygecko Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

geekygecko Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

geekygecko Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

geekygecko Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

geekygecko Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

mokagio Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

geekygecko commented Jan 5, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

wzieba left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

geekygecko commented Dec 15, 2025 •

edited

Loading

wpmobilebot commented Dec 15, 2025 •

edited

Loading

wpmobilebot commented Dec 15, 2025 •

edited

Loading

dangermattic commented Dec 15, 2025 •

edited

Loading