Skip to content

Test with Kotlin 2.2.0 #2124

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

Closed
wants to merge 11 commits into from
Closed

Test with Kotlin 2.2.0 #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7b81a9e
Update to kotlin 2.2.0-Beta2
eymar May 6, 2025
ff639ae
disable wasmKotlinStoreYarnLock task
eymar May 13, 2025
2e8869b
Workaround KT-77508 until Kotlin 2.2.0-RC1
eymar May 15, 2025
8929f2a
change the way :mpp collects test tasks
eymar May 15, 2025
749df82
Revert "change the way :mpp collects test tasks"
eymar May 16, 2025
8f67d8a
change the way :mpp collects test tasks
eymar May 16, 2025
df63080
Update API dumps. The changes are expected.
eymar May 16, 2025
8819021
bump kotlin to 2.2.0-RC
eymar May 19, 2025
5873036
disable kotlinWasmStoreYarnLock task
eymar May 19, 2025
1393516
bump kotlin version to 2.2.0-RC2
eymar Jun 6, 2025
6c1a60f
bump kotlin to 2.2.0
eymar Jun 23, 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
2 changes: 1 addition & 1 deletion .run/mpp/demo/js-Demo.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</option>
<option name="taskNames">
<list>
<option value="jsRun" />
<option value="jsBrowserDevelopmentRun" />
</list>
</option>
<option name="vmOptions" />
Expand Down
2 changes: 1 addition & 1 deletion .run/mpp/demo/wasm-Demo.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</option>
<option name="taskNames">
<list>
<option value="wasmJsBrowserRun" />
<option value="wasmJsBrowserDevelopmentRun" />
</list>
</option>
<option name="vmOptions" />
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ if (project.hasProperty("androidx.update.signatures")) {
allprojects {
this.tasks.configureEach {
if (it.name == "kotlinStoreYarnLock") it.enabled = false
if (it.name == "kotlinWasmStoreYarnLock") it.enabled = false
}
}
2 changes: 1 addition & 1 deletion buildSrc/private/src/main/kotlin/androidx/build/dokka/kmpDocs/DokkaPartialDocsTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ internal abstract class DokkaPartialDocsTask @Inject constructor(
if (compilation.target.platformType == KotlinPlatformType.androidJvm) {
// This is a workaround for https://youtrack.jetbrains.com/issue/KT-33893
@Suppress("DEPRECATION") // for compatibility
(compilation.compileKotlinTask as
(compilation.compileTaskProvider.get() as
org.jetbrains.kotlin.gradle.tasks.KotlinCompile).libraries
} else {
compilation.compileDependencyFiles
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetBrainsAndroidXImplPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.create
import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinTarget
Expand Down Expand Up @@ -168,6 +169,7 @@ private fun enableArtifactRedirectionPublishing(project: Project) {
}
}

@OptIn(InternalKotlinGradlePluginApi::class)
ext.targets.all { target ->
if (target.name.lowercase() in redirection.targetNames) {
project.publishAndroidxReference(target as AbstractKotlinTarget, newRootComponent)
Expand Down
16 changes: 8 additions & 8 deletions compose/foundation/foundation/api/desktop/foundation.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2014,23 +2014,23 @@ public final class androidx/compose/foundation/text/ClickableTextKt {
public final class androidx/compose/foundation/text/ComposableSingletons$BasicTextFieldKt {
public static final field INSTANCE Landroidx/compose/foundation/text/ComposableSingletons$BasicTextFieldKt;
public fun <init> ()V
public final fun getLambda-1$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-2$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-3$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-4$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$-665310900$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$444370233$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$486633673$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$759698998$foundation ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/foundation/text/ComposableSingletons$BasicTextField_desktopKt {
public static final field INSTANCE Landroidx/compose/foundation/text/ComposableSingletons$BasicTextField_desktopKt;
public fun <init> ()V
public final fun getLambda-1$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-2$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$-580413359$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$1808468638$foundation ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/foundation/text/ComposableSingletons$CoreTextFieldKt {
public static final field INSTANCE Landroidx/compose/foundation/text/ComposableSingletons$CoreTextFieldKt;
public fun <init> ()V
public final fun getLambda-1$foundation ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$559628295$foundation ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/foundation/text/ContextMenu_desktopKt {
Expand Down Expand Up @@ -2375,7 +2375,7 @@ public final class androidx/compose/foundation/v2/Scrollbar_desktopKt {
public final class androidx/compose/foundation/window/ComposableSingletons$WindowDraggableArea_desktopKt {
public static final field INSTANCE Landroidx/compose/foundation/window/ComposableSingletons$WindowDraggableArea_desktopKt;
public fun <init> ()V
public final fun getLambda-1$foundation ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$358499693$foundation ()Lkotlin/jvm/functions/Function2;
}

public final class androidx/compose/foundation/window/WindowDraggableArea_desktopKt {
Expand Down
2 changes: 1 addition & 1 deletion compose/material/material-navigation/api/desktop/material-navigation.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public final class androidx/compose/material/navigation/BottomSheetNavigatorShee
public final class androidx/compose/material/navigation/ComposableSingletons$BottomSheetNavigatorKt {
public static final field INSTANCE Landroidx/compose/material/navigation/ComposableSingletons$BottomSheetNavigatorKt;
public fun <init> ()V
public final fun getLambda-1$material_navigation ()Lkotlin/jvm/functions/Function4;
public final fun getLambda$-1104060618$material_navigation ()Lkotlin/jvm/functions/Function4;
}

public final class androidx/compose/material/navigation/NavGraphBuilderKt {
Expand Down
34 changes: 17 additions & 17 deletions compose/material/material/api/desktop/material.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,48 +285,48 @@ public final class androidx/compose/material/ColorsKt {
public final class androidx/compose/material/ComposableSingletons$AppBarKt {
public static final field INSTANCE Landroidx/compose/material/ComposableSingletons$AppBarKt;
public fun <init> ()V
public final fun getLambda-1$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-2$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$1260131259$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$269254275$material ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/material/ComposableSingletons$BackdropScaffoldKt {
public static final field INSTANCE Landroidx/compose/material/ComposableSingletons$BackdropScaffoldKt;
public fun <init> ()V
public final fun getLambda-1$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$2057676608$material ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/material/ComposableSingletons$BottomSheetScaffoldKt {
public static final field INSTANCE Landroidx/compose/material/ComposableSingletons$BottomSheetScaffoldKt;
public fun <init> ()V
public final fun getLambda-1$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-2$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-3$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-505419337$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$687232378$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$937349512$material ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/material/ComposableSingletons$ScaffoldKt {
public static final field INSTANCE Landroidx/compose/material/ComposableSingletons$ScaffoldKt;
public fun <init> ()V
public final fun getLambda-1$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-2$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-3$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-4$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-5$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-6$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-7$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda-8$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1341284559$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1406416085$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1624772335$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1836397928$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$1714259275$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$566090785$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$866784315$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$939725476$material ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/material/ComposableSingletons$SnackbarHostKt {
public static final field INSTANCE Landroidx/compose/material/ComposableSingletons$SnackbarHostKt;
public fun <init> ()V
public final fun getLambda-1$material ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$1890101041$material ()Lkotlin/jvm/functions/Function3;
}

public final class androidx/compose/material/ComposableSingletons$TabRowKt {
public static final field INSTANCE Landroidx/compose/material/ComposableSingletons$TabRowKt;
public fun <init> ()V
public final fun getLambda-1$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-2$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1216856915$material ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-222041980$material ()Lkotlin/jvm/functions/Function2;
}

public final class androidx/compose/material/ContentAlpha {
Expand Down
2 changes: 1 addition & 1 deletion compose/material3/adaptive/adaptive-layout/api/desktop/adaptive-layout.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public final class androidx/compose/material3/adaptive/layout/AnimatedPaneScope$
public final class androidx/compose/material3/adaptive/layout/ComposableSingletons$ThreePaneScaffoldKt {
public static final field INSTANCE Landroidx/compose/material3/adaptive/layout/ComposableSingletons$ThreePaneScaffoldKt;
public fun <init> ()V
public final fun getLambda-1$adaptive_layout ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$17047608$adaptive_layout ()Lkotlin/jvm/functions/Function2;
}

public abstract interface class androidx/compose/material3/adaptive/layout/ExtendedPaneScaffoldPaneScope : androidx/compose/material3/adaptive/layout/ExtendedPaneScaffoldScope, androidx/compose/material3/adaptive/layout/PaneScaffoldPaneScope {
Expand Down
16 changes: 8 additions & 8 deletions ...3/material3-adaptive-navigation-suite/api/desktop/material3-adaptive-navigation-suite.api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
public final class androidx/compose/material3/adaptive/navigationsuite/ComposableSingletons$NavigationSuiteScaffoldKt {
public static final field INSTANCE Landroidx/compose/material3/adaptive/navigationsuite/ComposableSingletons$NavigationSuiteScaffoldKt;
public fun <init> ()V
public final fun getLambda-1$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-2$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-3$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-4$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-5$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-6$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-7$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda-8$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1164008505$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1305500908$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1476022764$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1548300991$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1866128853$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-492711772$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$568924554$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$895267259$material3_adaptive_navigation_suite ()Lkotlin/jvm/functions/Function2;
}

public final class androidx/compose/material3/adaptive/navigationsuite/DefaultNavigationSuiteScaffoldOverride : androidx/compose/material3/adaptive/navigationsuite/NavigationSuiteScaffoldOverride {
Expand Down
Loading