Skip to content

Extract build-logic + migrate to AGP 9#2650

Merged
ZacSweers merged 30 commits intomainfrom
z/buildLogic
Apr 13, 2026
Merged

Extract build-logic + migrate to AGP 9#2650
ZacSweers merged 30 commits intomainfrom
z/buildLogic

Conversation

@ZacSweers
Copy link
Copy Markdown
Collaborator

@ZacSweers ZacSweers commented Apr 11, 2026

Unfortunately large change but this migration was a mess at the gradle level. Moved things to build-logic first (future project isolation work hopefully). Purely non-functional though, no prod sources changed!

Most of the line diff is deceiving and just classpath file moves and sample app file moves. For review I would focus on build-logic/**.*.kts files and build files

Other stuff

  • Lint appears to inexplicably always run with checkDependencies = true in application projects if they detect any KMP project dependencies. Filed https://issuetracker.google.com/issues/501744304
  • Extracted application projects for various samples since KMP android projects can only be libraries now
  • Android runtime classpath is a different name in KMP projects now, so had to regen dependency guard baselines
  • Cleaned up some wrong groupings for source sets (wrapping them in common {})
  • Remove kapt completely (only left in the tacos sample)
  • ewtf plugin appears to have a race condition in KMP projects so I have to apply it last, will raise over to them
  • Speed up unit tests using maxParallelForks

@ZacSweers ZacSweers marked this pull request as ready for review April 12, 2026 16:01
@ZacSweers ZacSweers requested a review from stagg April 12, 2026 16:01
@ZacSweers ZacSweers requested a review from kaeawc April 13, 2026 16:22
Copy link
Copy Markdown
Collaborator

@stagg stagg left a comment

Choose a reason for hiding this comment

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

🚀

@ZacSweers ZacSweers added this pull request to the merge queue Apr 13, 2026
Merged via the queue into main with commit 7c06fb1 Apr 13, 2026
5 checks passed
@ZacSweers ZacSweers deleted the z/buildLogic branch April 13, 2026 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants