Update Kotlin 2.2.0, update compose destinations

renovate[bot] · egorikftp · commit 4c938ac1cda4 · 2025-07-31T18:13:44.000+03:00
diff --git a/example/content/src/commonMain/kotlin/composegears/tiamat/example/content/content/advanced/AdvSharedElementTransition.kt b/example/content/src/commonMain/kotlin/composegears/tiamat/example/content/content/advanced/AdvSharedElementTransition.kt
@@ -68,7 +68,7 @@ private val AdvSharedElementTransitionScreen1 by navDestination<Unit> {
                     "This is SHARED element on screen 1",
                     modifier = Modifier
                         .sharedElement(
-                            state = rememberSharedContentState("element"),
+                            sharedContentState = rememberSharedContentState("element"),
                             animatedVisibilityScope = this@navDestination,
                         )
                         .renderInSharedTransitionScopeOverlay()
@@ -100,7 +100,7 @@ private val AdvSharedElementTransitionScreen2 by navDestination<Unit> {
                     "This is SHARED element on screen 2",
                     modifier = Modifier
                         .sharedElement(
-                            state = rememberSharedContentState("element"),
+                            sharedContentState = rememberSharedContentState("element"),
                             animatedVisibilityScope = this@navDestination,
                         )
                         .renderInSharedTransitionScopeOverlay()
@@ -140,7 +140,7 @@ private val AdvSharedElementTransitionScreen3 by navDestination<Unit> {
                     "This is SHARED element on screen 3",
                     modifier = Modifier
                         .sharedElement(
-                            state = rememberSharedContentState("element"),
+                            sharedContentState = rememberSharedContentState("element"),
                             animatedVisibilityScope = this@navDestination,
                         )
                         .renderInSharedTransitionScopeOverlay()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,22 @@
 [versions]
-agp = "8.9.2"
+agp = "8.9.3"
 android-compileSdk = "35"
 android-minSdk = "21"
 android-targetSdk = "35"
 
 detekt = "1.23.8"
-jetbrains-compose = "1.8.1"
-kotlin = "2.1.21"
+jetbrains-compose = "1.8.2"
+kotlin = "2.2.0"
 
 [libraries]
 androidx-activity-compose = "androidx.activity:activity-compose:1.10.1"
 androidx-camera-camera2 = "androidx.camera:camera-camera2:1.4.2"
 androidx-camera-lifecycle = "androidx.camera:camera-lifecycle:1.4.2"
 androidx-camera-view = "androidx.camera:camera-view:1.4.2"
-androidx-concurrent-futures = "androidx.concurrent:concurrent-futures-ktx:1.2.0"
-androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.9.1"
+androidx-concurrent-futures = "androidx.concurrent:concurrent-futures-ktx:1.3.0"
+androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.9.2"
 
-detekt-compose = "io.nlopez.compose.rules:detekt:0.4.22"
+detekt-compose = "io.nlopez.compose.rules:detekt:0.4.26"
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 
 koin-compose = "io.insert-koin:koin-compose:4.1.0"
@@ -26,12 +26,12 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlin-gradle-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
 
-zacsweers-kctfork = "dev.zacsweers.kctfork:core:0.7.1"
+zacsweers-kctfork = "dev.zacsweers.kctfork:core:0.8.0"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-binary-compatibility = "org.jetbrains.kotlinx.binary-compatibility-validator:0.17.0"
+binary-compatibility = "org.jetbrains.kotlinx.binary-compatibility-validator:0.18.1"
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
diff --git a/tiamat-destinations-compiler/compiler-plugin/src/main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsIrGenerationExtension.kt b/tiamat-destinations-compiler/compiler-plugin/src/main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsIrGenerationExtension.kt
@@ -7,7 +7,6 @@ import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.IrStatement
-import org.jetbrains.kotlin.ir.backend.js.utils.valueArguments
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.addFunction
 import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -17,16 +16,14 @@ import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.expressions.IrClassReference
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrGetValue
-import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
-import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
-import org.jetbrains.kotlin.ir.symbols.IrSymbol
-import org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI
+import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.types.classFqName
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.types.typeWith
 import org.jetbrains.kotlin.ir.util.isObject
 import org.jetbrains.kotlin.ir.util.isSubtypeOfClass
+import org.jetbrains.kotlin.ir.util.isVararg
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 import org.jetbrains.kotlin.name.CallableId
@@ -81,15 +78,15 @@ class TiamatDestinationsIrGenerationExtension(val logger: Logger) : IrGeneration
             override fun visitProperty(declaration: IrProperty): IrStatement {
                 declaration.annotations
                     .filter { it.type.classFqName == installInAnnotation }
-                    .mapNotNull { it.valueArguments.firstOrNull()?.extractContainerClass()?.symbol }
+                    .mapNotNull { it.arguments.firstOrNull()?.extractContainerClass()?.symbol }
                     .onEach { annotatedElements.getOrPut(it) { mutableListOf() }.add(declaration.symbol) }
                 return super.visitProperty(declaration)
             }
 
             override fun visitClass(declaration: IrClass): IrStatement {
                 declaration.annotations
                     .filter { it.type.classFqName == installInAnnotation }
-                    .mapNotNull { it.valueArguments.firstOrNull()?.extractContainerClass()?.symbol }
+                    .mapNotNull { it.arguments.firstOrNull()?.extractContainerClass()?.symbol }
                     .onEach { annotatedElements.getOrPut(it) { mutableListOf() }.add(declaration.symbol) }
                 return super.visitClass(declaration)
             }
@@ -173,7 +170,7 @@ class TiamatDestinationsIrGenerationExtension(val logger: Logger) : IrGeneration
         pluginContext: IrPluginContext
     ) {
         val navDestinationType = pluginContext.referenceClass(
-            ClassId(FqName("com.composegears.tiamat.navigation"), Name.identifier("NavDestination"))
+            ClassId(FqName("com.composegears.tiamat"), Name.identifier("NavDestination"))
         )!!
 
         // Remove defined function (cover from those who may try to override by their own)
@@ -193,12 +190,6 @@ class TiamatDestinationsIrGenerationExtension(val logger: Logger) : IrGeneration
             val irBuilder = DeclarationIrBuilder(pluginContext, this.symbol)
 
             body = irBuilder.irBlockBody {
-                val arrayOfCall = irCall(
-                    callee = pluginContext.referenceFunctions(
-                        CallableId(FqName("kotlin"), Name.identifier("arrayOf"))
-                    ).first(),
-                    type = pluginContext.irBuiltIns.arrayClass.typeWith(navDestinationType.defaultType)
-                )
                 // Add each annotated element to the array
                 val args: List<IrExpression> = elements.mapNotNull { symbol ->
                     when (symbol) {
@@ -214,17 +205,26 @@ class TiamatDestinationsIrGenerationExtension(val logger: Logger) : IrGeneration
                         else -> null
                     }
                 }
-
-                arrayOfCall.putTypeArgument(0, navDestinationType.defaultType)
-                arrayOfCall.putValueArgument(0, irVararg(navDestinationType.defaultType, args))
+                val arrayOfCall = irCall(findArrayOfSymbol(pluginContext))
+                arrayOfCall.typeArguments[0] = navDestinationType.defaultType
+                arrayOfCall.arguments[0] = irVararg(navDestinationType.defaultType, args)
                 +irReturn(arrayOfCall)
             }
         }
     }
 
+    private fun findArrayOfSymbol(pluginContext: IrPluginContext): IrSimpleFunctionSymbol {
+        val callableId = CallableId(FqName("kotlin"), Name.identifier("arrayOf"))
+        // find `arrayOf<T>(vararg elements: T)`
+        return pluginContext.referenceFunctions(callableId).singleOrNull {
+            val params = it.owner.parameters
+            params.size == 1 && params[0].isVararg
+        } ?: error("arrayOf function not found")
+    }
+
     private fun isValidAnnotationTarget(symbol: IrSymbol, pluginContext: IrPluginContext): Boolean {
         val navDestinationType = pluginContext.referenceClass(
-            ClassId(FqName("com.composegears.tiamat.navigation"), Name.identifier("NavDestination"))
+            ClassId(FqName("com.composegears.tiamat"), Name.identifier("NavDestination"))
         )!!
         return when (symbol) {
             is IrPropertySymbol -> {
diff --git a/tiamat-destinations/api/android/tiamat-destinations.api b/tiamat-destinations/api/android/tiamat-destinations.api
@@ -7,8 +7,8 @@ public abstract interface annotation class com/composegears/tiamat/destinations/
 }
 
 public abstract interface class com/composegears/tiamat/destinations/TiamatGraph {
-	public abstract fun destinations ()[Lcom/composegears/tiamat/NavDestination;
-	public abstract fun plus (Lcom/composegears/tiamat/destinations/TiamatGraph;)Lcom/composegears/tiamat/destinations/TiamatGraph;
+	public fun destinations ()[Lcom/composegears/tiamat/NavDestination;
+	public fun plus (Lcom/composegears/tiamat/destinations/TiamatGraph;)Lcom/composegears/tiamat/destinations/TiamatGraph;
 }
 
 public final class com/composegears/tiamat/destinations/TiamatGraph$DefaultImpls {
diff --git a/tiamat-destinations/api/jvm/tiamat-destinations.api b/tiamat-destinations/api/jvm/tiamat-destinations.api
@@ -7,8 +7,8 @@ public abstract interface annotation class com/composegears/tiamat/destinations/
 }
 
 public abstract interface class com/composegears/tiamat/destinations/TiamatGraph {
-	public abstract fun destinations ()[Lcom/composegears/tiamat/NavDestination;
-	public abstract fun plus (Lcom/composegears/tiamat/destinations/TiamatGraph;)Lcom/composegears/tiamat/destinations/TiamatGraph;
+	public fun destinations ()[Lcom/composegears/tiamat/NavDestination;
+	public fun plus (Lcom/composegears/tiamat/destinations/TiamatGraph;)Lcom/composegears/tiamat/destinations/TiamatGraph;
 }
 
 public final class com/composegears/tiamat/destinations/TiamatGraph$DefaultImpls {
diff --git a/tiamat/api/android/tiamat.api b/tiamat/api/android/tiamat.api
@@ -24,7 +24,7 @@ public final class com/composegears/tiamat/ComposeKt {
 
 public abstract interface class com/composegears/tiamat/ContentExtension : com/composegears/tiamat/Extension {
 	public abstract fun Content (Lcom/composegears/tiamat/NavDestinationScope;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun getType ()Lcom/composegears/tiamat/ContentExtension$Type;
+	public fun getType ()Lcom/composegears/tiamat/ContentExtension$Type;
 }
 
 public final class com/composegears/tiamat/ContentExtension$DefaultImpls {
@@ -140,6 +140,7 @@ public final class com/composegears/tiamat/NavDestinationKt {
 
 public abstract class com/composegears/tiamat/NavDestinationScope : androidx/compose/animation/AnimatedVisibilityScope {
 	public static final field $stable I
+	public fun animateEnterExit (Landroidx/compose/ui/Modifier;Landroidx/compose/animation/EnterTransition;Landroidx/compose/animation/ExitTransition;Ljava/lang/String;)Landroidx/compose/ui/Modifier;
 }
 
 public final class com/composegears/tiamat/NavEntry : com/composegears/tiamat/Route$Element {
diff --git a/tiamat/api/jvm/tiamat.api b/tiamat/api/jvm/tiamat.api
@@ -24,7 +24,7 @@ public final class com/composegears/tiamat/ComposeKt {
 
 public abstract interface class com/composegears/tiamat/ContentExtension : com/composegears/tiamat/Extension {
 	public abstract fun Content (Lcom/composegears/tiamat/NavDestinationScope;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun getType ()Lcom/composegears/tiamat/ContentExtension$Type;
+	public fun getType ()Lcom/composegears/tiamat/ContentExtension$Type;
 }
 
 public final class com/composegears/tiamat/ContentExtension$DefaultImpls {
@@ -146,6 +146,7 @@ public final class com/composegears/tiamat/NavDestinationKt {
 
 public abstract class com/composegears/tiamat/NavDestinationScope : androidx/compose/animation/AnimatedVisibilityScope {
 	public static final field $stable I
+	public fun animateEnterExit (Landroidx/compose/ui/Modifier;Landroidx/compose/animation/EnterTransition;Landroidx/compose/animation/ExitTransition;Ljava/lang/String;)Landroidx/compose/ui/Modifier;
 }
 
 public final class com/composegears/tiamat/NavEntry : com/composegears/tiamat/Route$Element {

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ public abstract interface annotation class com/composegears/tiamat/destinations/`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`public abstract interface class com/composegears/tiamat/destinations/TiamatGraph {`
`10`		`- public abstract fun destinations ()[Lcom/composegears/tiamat/NavDestination;`
`11`		`- public abstract fun plus (Lcom/composegears/tiamat/destinations/TiamatGraph;)Lcom/composegears/tiamat/destinations/TiamatGraph;`
	`10`	`+ public fun destinations ()[Lcom/composegears/tiamat/NavDestination;`
	`11`	`+ public fun plus (Lcom/composegears/tiamat/destinations/TiamatGraph;)Lcom/composegears/tiamat/destinations/TiamatGraph;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public final class com/composegears/tiamat/destinations/TiamatGraph$DefaultImpls {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public final class com/composegears/tiamat/ComposeKt {`
`24`	`24`
`25`	`25`	`public abstract interface class com/composegears/tiamat/ContentExtension : com/composegears/tiamat/Extension {`
`26`	`26`	`public abstract fun Content (Lcom/composegears/tiamat/NavDestinationScope;Landroidx/compose/runtime/Composer;I)V`
`27`		`- public abstract fun getType ()Lcom/composegears/tiamat/ContentExtension$Type;`
	`27`	`+ public fun getType ()Lcom/composegears/tiamat/ContentExtension$Type;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public final class com/composegears/tiamat/ContentExtension$DefaultImpls {`
`@@ -140,6 +140,7 @@ public final class com/composegears/tiamat/NavDestinationKt {`
`140`	`140`
`141`	`141`	`public abstract class com/composegears/tiamat/NavDestinationScope : androidx/compose/animation/AnimatedVisibilityScope {`
`142`	`142`	`public static final field $stable I`
	`143`	`+ public fun animateEnterExit (Landroidx/compose/ui/Modifier;Landroidx/compose/animation/EnterTransition;Landroidx/compose/animation/ExitTransition;Ljava/lang/String;)Landroidx/compose/ui/Modifier;`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`public final class com/composegears/tiamat/NavEntry : com/composegears/tiamat/Route$Element {`