Skip to content

Conversation

@eymar
Copy link
Member

@eymar eymar commented Oct 16, 2025

Testing

N/A

Release Notes

N/A

languageVersion.set(KotlinVersion.KOTLIN_2_1)
apiVersion.set(KotlinVersion.KOTLIN_2_1)
languageVersion.set(KotlinVersion.KOTLIN_2_2)
apiVersion.set(KotlinVersion.KOTLIN_2_2)
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need it? It's KOTLIN_2_0 in AOSP and in general it should be the same. It was bumped to 2.1 because of changes in datetime

Copy link
Member Author

Choose a reason for hiding this comment

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

because of the errors in the existing code saying the features are only available in LV_2_2

Copy link
Member

Choose a reason for hiding this comment

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

🤔 where it was required? why did it work?

Copy link
Member Author

Choose a reason for hiding this comment

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

compose/animation/animation/src/commonMain/kotlin/androidx/compose/animation/SharedTransitionScope.kt:813:39 Default parameters in open @Composable functions are not supported before language version 2.2 (configured version is 2.1)

https://github.com/JetBrains/compose-multiplatform-core/blob/jb-main/compose/animation/animation/src/commonMain/kotlin/androidx/compose/animation/SharedTransitionScope.kt#L813

Copy link
Member

Choose a reason for hiding this comment

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

It's common code and AOSP compiles it with 2_0. I don't understand why it works. Bumping it mono-repo wide seems like hiding another issue

Copy link
Member Author

Choose a reason for hiding this comment

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

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 created a task to lower the LV back before 1.10.0-beta02 - https://youtrack.jetbrains.com/issue/CMP-9144 so we could proceed here.

Copy link
Member

Choose a reason for hiding this comment

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

Since beta01 merge is already waiting, I don't see the reason to postpone this revert. But in general, I guess it's not a blocker

Copy link
Member Author

@eymar eymar Oct 24, 2025

Choose a reason for hiding this comment

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

Here, I can revert the function declration manually - which is not good I suppose.
But I can't revert the LV bump because the CI would become red.

Copy link
Member

Choose a reason for hiding this comment

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

Yep, I mean let's revert it before beta01, not beta02

@eymar eymar marked this pull request as draft October 16, 2025 13:43
@eymar eymar force-pushed the ok/jb-main-kotlin-2-2-20_new branch 2 times, most recently from 7879539 to 8f3a14b Compare October 23, 2025 14:23
@eymar eymar marked this pull request as ready for review October 24, 2025 09:51
@eymar eymar force-pushed the ok/jb-main-kotlin-2-2-20_new branch from 8f3a14b to 7f3bccc Compare October 24, 2025 10:01
kotlin = "2.2.20"
kotlinComposeCompiler = "2.2.20"
kotlinBenchmark = "0.4.11"
kotlinComposeCompiler = "2.2.10-441"
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick, please keep things sorted

@eymar eymar merged commit d5d71b2 into jb-main Oct 24, 2025
18 checks passed
@eymar eymar deleted the ok/jb-main-kotlin-2-2-20_new branch October 24, 2025 10:45
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.

2 participants