Skip to content

Kotlin 2.2.20 #2491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2025
Merged

Kotlin 2.2.20 #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25321a0
kotlin version 2.2.20 and LV 2_2
eymar Oct 16, 2025
7f3bccc
update api dump after rebase
eymar Oct 24, 2025
3da7be8
sort the versions in libs.versions.toml
eymar Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ class AndroidXImplPlugin @Inject constructor(val componentFactory: SoftwareCompo
project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
project.extensions.configure(KotlinMultiplatformExtension::class.java) {
it.compilerOptions {
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

@MatkovIvan MatkovIvan Oct 16, 2025

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

@eymar eymar Oct 16, 2025

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

@MatkovIvan MatkovIvan Oct 16, 2025

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

@eymar eymar Oct 16, 2025

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

@MatkovIvan MatkovIvan Oct 16, 2025

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

@eymar eymar Oct 23, 2025

Choose a reason for hiding this comment

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

Fixed in https://android-review.googlesource.com/c/platform/frameworks/support/+/3807006

Copy link
Member Author

@eymar eymar Oct 23, 2025

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

@MatkovIvan MatkovIvan Oct 24, 2025

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 •
edited
Loading

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

@MatkovIvan MatkovIvan Oct 24, 2025

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

}
}
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ open class AndroidXMultiplatformExtension(val project: Project) {
}


private fun Project.configurePinnedKotlinLibraries(platform: PlatformIdentifier) {
internal fun Project.configurePinnedKotlinLibraries(platform: PlatformIdentifier) {
multiplatformExtension?.let {
val kotlinLibSuffix =
when (platform) {
Expand Down
4 changes: 4 additions & 0 deletions ...src/main/kotlin/org/jetbrains/androidx/build/AndroidXComposeMultiplatformExtensionImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package org.jetbrains.androidx.build

import androidx.build.AndroidXComposeMultiplatformExtension
import androidx.build.PlatformIdentifier
import androidx.build.configurePinnedKotlinLibraries
import javax.inject.Inject
import org.gradle.api.Project
import org.gradle.api.tasks.Copy
Expand Down Expand Up @@ -89,6 +91,7 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(

override fun js(): Unit = multiplatformExtension.run {
js(KotlinJsCompilerType.IR) {
project.configurePinnedKotlinLibraries(PlatformIdentifier.JS)
browser {
testTask {
it.passTestFlagsToEnvironment()
Expand Down Expand Up @@ -146,6 +149,7 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
@OptIn(ExperimentalWasmDsl::class)
override fun wasm(): Unit = multiplatformExtension.run {
wasmJs {
project.configurePinnedKotlinLibraries(PlatformIdentifier.WASM_JS)
browser {
testTask {
it.passTestFlagsToEnvironment()
Expand Down
20 changes: 0 additions & 20 deletions compose/animation/animation-core/api/animation-core.klib.api
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions compose/animation/animation-graphics/api/animation-graphics.klib.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,5 @@ final class androidx.compose.animation.graphics.vector/AnimatedImageVector { //
}

final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedImageVector$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedImageVector$stableprop|#static{}androidx_compose_animation_graphics_vector_AnimatedImageVector$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedVectorTarget$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedVectorTarget$stableprop|#static{}androidx_compose_animation_graphics_vector_AnimatedVectorTarget$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Animator$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Animator$stableprop|#static{}androidx_compose_animation_graphics_vector_Animator$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatorSet$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatorSet$stableprop|#static{}androidx_compose_animation_graphics_vector_AnimatorSet$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Keyframe$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Keyframe$stableprop|#static{}androidx_compose_animation_graphics_vector_Keyframe$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_ObjectAnimator$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_ObjectAnimator$stableprop|#static{}androidx_compose_animation_graphics_vector_ObjectAnimator$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValues$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValues$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValues$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolder$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder1D$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder1D$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolder1D$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder2D$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder2D$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolder2D$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderColor$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderColor$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolderColor$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderFloat$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderFloat$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolderFloat$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderInt$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderInt$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolderInt$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderPath$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderPath$stableprop|#static{}androidx_compose_animation_graphics_vector_PropertyValuesHolderPath$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_StateVectorConfig$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_StateVectorConfig$stableprop|#static{}androidx_compose_animation_graphics_vector_StateVectorConfig$stableprop[0]
final val androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Timestamp$stableprop // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Timestamp$stableprop|#static{}androidx_compose_animation_graphics_vector_Timestamp$stableprop[0]

final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedImageVector$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedImageVector$stableprop_getter|androidx_compose_animation_graphics_vector_AnimatedImageVector$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedVectorTarget$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatedVectorTarget$stableprop_getter|androidx_compose_animation_graphics_vector_AnimatedVectorTarget$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Animator$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Animator$stableprop_getter|androidx_compose_animation_graphics_vector_Animator$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatorSet$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_AnimatorSet$stableprop_getter|androidx_compose_animation_graphics_vector_AnimatorSet$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Keyframe$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Keyframe$stableprop_getter|androidx_compose_animation_graphics_vector_Keyframe$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_ObjectAnimator$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_ObjectAnimator$stableprop_getter|androidx_compose_animation_graphics_vector_ObjectAnimator$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValues$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValues$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValues$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolder$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder1D$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder1D$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolder1D$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder2D$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolder2D$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolder2D$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderColor$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderColor$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolderColor$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderFloat$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderFloat$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolderFloat$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderInt$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderInt$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolderInt$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderPath$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_PropertyValuesHolderPath$stableprop_getter|androidx_compose_animation_graphics_vector_PropertyValuesHolderPath$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_StateVectorConfig$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_StateVectorConfig$stableprop_getter|androidx_compose_animation_graphics_vector_StateVectorConfig$stableprop_getter(){}[0]
final fun androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Timestamp$stableprop_getter(): kotlin/Int // androidx.compose.animation.graphics.vector/androidx_compose_animation_graphics_vector_Timestamp$stableprop_getter|androidx_compose_animation_graphics_vector_Timestamp$stableprop_getter(){}[0]
Loading