Skip to content

Conversation

@terrakok
Copy link
Member

@terrakok terrakok commented Oct 29, 2025

Update test AGP and Gradle versions and all test projects.

gradle: ['8.7', '9.0.0'] -> ['8.13', '9.2.0']
agp: ['8.6.0', '8.9.0', '9.0.0-alpha01'] -> ['8.11.2', '8.12.3', '9.0.0-alpha13']

Fixes CMP-9162 Bump AGP 9.0 latest alpha tests

Testing

Integration tests

Release Notes

N/A

@terrakok terrakok requested a review from MatkovIvan October 29, 2025 16:36

sourceSets {
commonMain.dependencies {
api(compose.runtime)
Copy link
Member

Choose a reason for hiding this comment

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

Plugin aliases are depreceted, please use version catalog instead. Replace version dynamically based on CI params if needed (see Viktor's PR as example)

Copy link
Member Author

Choose a reason for hiding this comment

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

it should be done as part of Victor's work, I guess

Copy link
Member

Choose a reason for hiding this comment

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

Probably not. It's already deprecated, so adding new setup with deprecated approach doesn't sound good
cc @kropp

Copy link
Member Author

Choose a reason for hiding this comment

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

I did it to be consistent with other test projects

Copy link
Member

Choose a reason for hiding this comment

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

Both points are valid, I logged CMP-9183 Migrate Gradle test projects to version catalogs, and will migrate all projects next week.
Here, I'd leave it up to @terrakok

Copy link
Member

Choose a reason for hiding this comment

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

I'm updating existing tests in #5469, so it now makes sense to align new test too

}
dependencyResolutionManagement {
repositories {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
Copy link
Member

Choose a reason for hiding this comment

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

Why the order is different from repositories block?

Copy link
Member Author

Choose a reason for hiding this comment

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

it doesn't matter

Copy link
Member

Choose a reason for hiding this comment

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

It might matter. Especially the order of maven-local and our dev, since we have https://youtrack.jetbrains.com/issue/CMP-8850 🙈

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, I know it matters in a gradle logic. but in our tests projects there is a lot of such mess

Copy link
Member Author

Choose a reason for hiding this comment

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

I will try to fix what I find

Copy link
Member Author

Choose a reason for hiding this comment

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

no. I won't
CMP-9182 Refactor settings.gradle in tests projects

gradle: ['8.7', '9.0.0']
agp: ['8.6.0', '8.9.0', '9.0.0-alpha01']
gradle: ['8.13', '9.2.0']
agp: ['8.11.2', '8.12.3', '9.0.0-alpha11']
Copy link
Member

Choose a reason for hiding this comment

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

This should be done on TeamCity as well. Please

  • Make the changes inside compose-teamcity-config repo inside the branch with the same name
  • Open PR on space to review that part too
  • Run SNAPSHOT build from your branch to make sure that it's green

Copy link
Member Author

Choose a reason for hiding this comment

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

@terrakok terrakok merged commit 840d490 into master Oct 31, 2025
18 of 19 checks passed
@terrakok terrakok deleted the agp-migration branch October 31, 2025 13:22
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.

4 participants