Skip to content

Conversation

@mcarare
Copy link
Contributor

@mcarare mcarare commented Dec 3, 2025

  • Update android-gradle-plugin version in version catalog.
  • Remove kotlin-android plugin alias from version catalog and root build file.
  • Migrate android.applicationVariants.configureEach logic in app/build.gradle to androidComponents API (beforeVariants and onVariants) to support AGP 9.0.
  • Use variant.buildConfigFields.put instead of buildConfigField.
  • Update version code generation logic to use variant.outputs within onVariants.
  • Remove variantFilter block in favor of beforeVariants disabling.
  • Migrate kotlinOptions.allWarningsAsErrors to tasks.withType(KotlinCompile).compilerOptions.

Pull Request checklist

@rvandermeulen
Copy link
Contributor

This looks great, thanks for getting it figured out! Just documenting here what we discussed on Slack that we probably want to manually specify the Kotlin version still rather than relying on whatever one AGP happens to want to use. Looks like a pretty easy thing to add:
https://issuetracker.google.com/issues/438678642#comment21

- Update `android-gradle-plugin` version in version catalog.
- Remove `kotlin-android` plugin alias from version catalog and root build file.
- Migrate `android.applicationVariants.configureEach` logic in `app/build.gradle` to `androidComponents` API (`beforeVariants` and `onVariants`) to support AGP 9.0.
- Use `variant.buildConfigFields.put` instead of `buildConfigField`.
- Update version code generation logic to use `variant.outputs` within `onVariants`.
- Remove `variantFilter` block in favor of `beforeVariants` disabling.
- Migrate `kotlinOptions.allWarningsAsErrors` to `tasks.withType(KotlinCompile).compilerOptions`.
@mcarare mcarare marked this pull request as ready for review December 3, 2025 15:53
@mergify
Copy link

mergify bot commented Dec 3, 2025

Merge Queue Status Beta

🚫 The pull request has left the queue (rule: default)

This pull request spent 12 minutes 57 seconds in the queue, with no time running CI.
The checks were run in-place.

Required conditions to merge
  • status-success=pr-complete

Reason

Pull request #3988 has been dequeued by a dequeue command

Hint

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.
If you do update this pull request, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@mergify mergify bot added the queued label Dec 3, 2025
@rvandermeulen
Copy link
Contributor

@mergify dequeue

@mergify
Copy link

mergify bot commented Dec 3, 2025

dequeue

✅ The pull request has been removed from the queue

@mergify mergify bot added queued and removed queued labels Dec 3, 2025
@rvandermeulen
Copy link
Contributor

@jonalmeida Something is very broken with mergify. I'm actually not opposed to this landing when CI is green, but it should probably get an r+ first at least 😆

@mergify mergify bot added the dequeued label Dec 3, 2025
@jonalmeida
Copy link
Collaborator

Let me take a look!

Copy link
Contributor

@rvandermeulen rvandermeulen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While this is still in Beta, it's getting pretty close to a stable release and I think it'd be beneficial for us to start getting some exposure to AGP 9.0 now to aid in the eventual Firefox transition down the road. I'd vote in favor of landing this but will defer to @jonalmeida to make the final call.

@jonalmeida
Copy link
Collaborator

@Mergifyio refresh

@mergify
Copy link

mergify bot commented Dec 3, 2025

refresh

✅ Pull request refreshed

@mergify
Copy link

mergify bot commented Dec 3, 2025

Merge Queue Status Beta

✅ The pull request has been merged

This pull request spent 34 minutes 4 seconds in the queue, including 33 minutes 51 seconds running CI.
The checks were run in-place.

Required conditions to merge
  • status-success=pr-complete

@mergify mergify bot added queued and removed dequeued labels Dec 3, 2025
@jonalmeida jonalmeida merged commit 8d133dd into mozilla-mobile:master Dec 3, 2025
13 checks passed
@mergify mergify bot removed the queued label Dec 3, 2025
@jonalmeida
Copy link
Collaborator

My changes to Github configuration did not work and this merged while I was in a meeting. 🤦

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants