Get Zipline building on Kotlin 2.2

This is an incremental step to make Zipline compatible
with the Kotlin 2.2 compiler. Fixing deprecation warnings
and removing suppressions is the necessary next step.

Author: squarejesse

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 * In-development snapshots are now published to the Central Portal Snapshots repository at https://central.sonatype.com/repository/maven-snapshots/.
 
+ * Upgrade: [Kotlin 2.2.0][kotlin_2_2_0].
+
 
 ## [1.21.1] - 2025-07-17
 [1.21.1]: https://github.com/cashapp/zipline/releases/tag/1.21.1
@@ -617,6 +619,7 @@ Initial release.
 [kotlin_1_9_23]: https://github.com/JetBrains/kotlin/releases/tag/v1.9.23
 [kotlin_2_0_0]: https://github.com/JetBrains/kotlin/releases/tag/v2.0.0
 [kotlin_2_1_21]: https://github.com/JetBrains/kotlin/releases/tag/v2.1.21
+[kotlin_2_2_0]: https://github.com/JetBrains/kotlin/releases/tag/v2.2.0
 [kotlin_serialization_1_4_0]: https://github.com/Kotlin/kotlinx.serialization/releases/tag/v1.4.0
 [kotlin_serialization_1_5_0]: https://github.com/Kotlin/kotlinx.serialization/releases/tag/v1.5.0
 [kotlin_serialization_1_5_1]: https://github.com/Kotlin/kotlinx.serialization/releases/tag/v1.5.1

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 androidx-compose = "1.8.3"
 compileSdk = "35"
 jetty = "12.0.23"
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlinx-coroutines = "1.10.2"
-kotlinx-serialization = "1.8.1"
+kotlinx-serialization = "1.9.0"
 okHttp = "4.12.0"
 okio = "3.15.0"
 minSdk = "21"

zipline-api-validator/src/main/kotlin/app/cash/zipline/api/validator/fir/FirZiplineApiReader.kt

@@ -16,19 +16,21 @@
 package app.cash.zipline.api.validator.fir
 
 import java.io.File
+import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.analysis.checkers.isSupertypeOf
-import org.jetbrains.kotlin.fir.declarations.FirDeclaration
-import org.jetbrains.kotlin.fir.declarations.FirFunction
-import org.jetbrains.kotlin.fir.declarations.FirProperty
+import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
+import org.jetbrains.kotlin.fir.declarations.processAllDeclarations
 import org.jetbrains.kotlin.fir.declarations.utils.isInterface
 import org.jetbrains.kotlin.fir.declarations.utils.isSuspend
 import org.jetbrains.kotlin.fir.pipeline.FirResult
 import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
 import org.jetbrains.kotlin.fir.resolve.toClassLikeSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.FirStarProjection
 import org.jetbrains.kotlin.fir.types.FirTypeProjection
@@ -38,6 +40,7 @@ import org.jetbrains.kotlin.fir.types.FirUserTypeRef
 import org.jetbrains.kotlin.fir.types.abbreviatedTypeOrSelf
 import org.jetbrains.kotlin.fir.types.coneType
 import org.jetbrains.kotlin.fir.types.lookupTagIfAny
+import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -76,7 +79,7 @@ internal class FirZiplineApiReader(
 
   fun read(): FirZiplineApi {
     val types = platformOutput.fir
-      .flatMap { it.declarations.findRegularClassesRecursive() }
+      .flatMap { it.regularClasses() }
       .filter { it.isInterface && it.isZiplineService }
 
     val services = types
@@ -108,15 +111,15 @@ internal class FirZiplineApiReader(
       if (!supertype.isInterface) continue // Skip kotlin.Any.
       if (supertype.symbol.classId == autoCloseableClassId) continue // Skip AutoCloseable.
 
-      for (declaration in supertype.declarations) {
-        when (declaration) {
-          is FirFunction -> {
-            if (declaration.isNonInterfaceFunction) continue
-            result += declaration.asDeclaredZiplineFunction()
+      supertype.processAllDeclarations(session) { symbol ->
+        when (symbol) {
+          is FirFunctionSymbol -> {
+            if (symbol.isNonInterfaceFunction) return@processAllDeclarations
+            result += symbol.asDeclaredZiplineFunction()
           }
 
-          is FirProperty -> {
-            result += declaration.asDeclaredZiplineFunction()
+          is FirPropertySymbol -> {
+            result += symbol.asDeclaredZiplineFunction()
           }
 
           else -> Unit
@@ -127,23 +130,23 @@ internal class FirZiplineApiReader(
     return result.toList()
   }
 
-  private val FirFunction.isNonInterfaceFunction: Boolean
-    get() = symbol.name.identifier in NON_INTERFACE_FUNCTION_NAMES
+  private val FirFunctionSymbol<*>.isNonInterfaceFunction: Boolean
+    get() = name.identifier in NON_INTERFACE_FUNCTION_NAMES
 
-  private fun FirFunction.asDeclaredZiplineFunction(): FirZiplineFunction {
+  private fun FirFunctionSymbol<*>.asDeclaredZiplineFunction(): FirZiplineFunction {
     val signature = buildString {
       if (isSuspend) append("suspend ")
-      append("fun ${symbol.name.identifier}(")
-      valueParameters.joinTo(this) { it.returnTypeRef.asString() }
-      append("): ${returnTypeRef.asString()}")
+      append("fun ${name.identifier}(")
+      valueParameterSymbols.joinTo(this) { it.resolvedReturnTypeRef.asString() }
+      append("): ${resolvedReturnTypeRef.asString()}")
     }
 
     return FirZiplineFunction(signature)
   }
 
-  private fun FirProperty.asDeclaredZiplineFunction(): FirZiplineFunction {
+  private fun FirPropertySymbol.asDeclaredZiplineFunction(): FirZiplineFunction {
     val valOrVar = if (isVar) "var" else "val"
-    val signature = "$valOrVar ${symbol.name.identifier}: ${returnTypeRef.asString()}"
+    val signature = "$valOrVar ${name.identifier}: ${resolvedReturnTypeRef.asString()}"
     return FirZiplineFunction(signature)
   }
 
@@ -186,8 +189,28 @@ internal class FirZiplineApiReader(
     }
   }
 
-  private fun List<FirDeclaration>.findRegularClassesRecursive(): List<FirRegularClass> {
-    val classes = filterIsInstance<FirRegularClass>()
-    return classes + classes.flatMap { it.declarations.findRegularClassesRecursive() }
+  /** Collect all regular class declarations in this. */
+  private fun FirFile.regularClasses(): List<FirRegularClass> {
+    val result = mutableListOf<FirRegularClass>()
+    accept(
+      visitor = object : FirDefaultVisitor<Unit, MutableList<FirRegularClass>>() {
+        override fun visitRegularClass(
+          regularClass: FirRegularClass,
+          data: MutableList<FirRegularClass>
+        ) {
+          super.visitRegularClass(regularClass, data)
+          data.add(regularClass)
+        }
+
+        override fun visitElement(
+          element: FirElement,
+          data: MutableList<FirRegularClass>
+        ) {
+          element.acceptChildren(this, data)
+        }
+      },
+      data = result,
+    )
+    return result
   }
 }

zipline-gradle-plugin/src/test/kotlin/app/cash/zipline/gradle/ZiplineGradlePluginTest.kt

@@ -93,13 +93,13 @@ class ZiplineGradlePluginTest {
       .contains(result.task(taskName)!!.outcome)
     assertThat(result.output.lines()).containsMatchForEachInOrder(
       Regex("""app.cash.zipline.ZiplineException: \w+: boom!"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/CrashService.kt\)"""),
-      Regex("""at <anonymous> \(lib.js\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/internal/bridge/InboundService.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/internal/bridge/Endpoint.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/CrashService.kt\)"""),
+      Regex("""at [^ ]+ \(lib.js\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/internal/bridge/InboundService.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/internal/bridge/Endpoint.kt\)"""),
       Regex("""at app.cash.zipline.tests.CrashService[${'$'}]Companion[${'$'}]Adapter[${'$'}]GeneratedOutboundService.crash\(CrashService.kt:\d+\)"""),
     )
   }
@@ -120,13 +120,13 @@ class ZiplineGradlePluginTest {
       .contains(result.task(taskName)!!.outcome)
     assertThat(result.output.lines()).containsMatchForEachInOrder(
       Regex("""app.cash.zipline.ZiplineException: Exception: boom!"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt:\d+\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/CrashService.kt\)"""),
-      Regex("""at <anonymous> \(lib.js\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/internal/bridge/InboundService.kt:\d+\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/internal/bridge/Endpoint.kt:\d+\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt:\d+\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/tests/CrashService.kt\)"""),
+      Regex("""at [^ ]+ \(lib.js\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/internal/bridge/InboundService.kt:\d+\)"""),
+      Regex("""at [^ ]+ \(app/cash/zipline/internal/bridge/Endpoint.kt:\d+\)"""),
       Regex("""at app.cash.zipline.tests.CrashService[${'$'}]Companion[${'$'}]Adapter[${'$'}]GeneratedOutboundService.crash\(CrashService.kt:\d+\)"""),
     )
   }
@@ -146,12 +146,12 @@ class ZiplineGradlePluginTest {
       .contains(result.task(taskName)!!.outcome)
     assertThat(result.output.lines()).containsMatchForEachInOrder(
       Regex("""app.cash.zipline.ZiplineException: Exception: boom!"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt:\d+\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/tests/CrashService.kt\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/internal/bridge/InboundService.kt:\d+\)"""),
-      Regex("""at <anonymous> \(app/cash/zipline/internal/bridge/Endpoint.kt:\d+\)"""),
+      Regex("""at goBoom_[^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at crash_[^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt:\d+\)"""),
+      Regex("""at crash_[^ ]+ \(app/cash/zipline/tests/launchCrashServiceJs.kt\)"""),
+      Regex("""at call_[^ ]+ \(app/cash/zipline/tests/CrashService.kt\)"""),
+      Regex("""at call_[^ ]+ \(app/cash/zipline/internal/bridge/InboundService.kt:\d+\)"""),
+      Regex("""at call_[^ ]+ \(app/cash/zipline/internal/bridge/Endpoint.kt:\d+\)"""),
       Regex("""at app.cash.zipline.tests.CrashService[${'$'}]Companion[${'$'}]Adapter[${'$'}]GeneratedOutboundService.crash\(CrashService.kt:\d+\)"""),
     )
   }

zipline-kotlin-plugin/src/main/kotlin/app/cash/zipline/kotlin/AdapterGenerator.kt

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package app.cash.zipline.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.ScopeWithIr
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.ir.addDispatchReceiver

zipline-kotlin-plugin/src/main/kotlin/app/cash/zipline/kotlin/AddAdapterArgumentRewriter.kt

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package app.cash.zipline.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.ScopeWithIr
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
@@ -79,7 +82,7 @@ internal class AddAdapterArgumentRewriter(
     ).adapterExpression(bridgedInterfaceType as IrSimpleType)
 
     return irCall(original, rewrittenFunction).apply {
-      putValueArgument(valueArgumentsCount - 1, adapterExpression)
+      arguments += adapterExpression
       patchDeclarationParents(declarationParent)
     }
   }

zipline-kotlin-plugin/src/main/kotlin/app/cash/zipline/kotlin/BridgedInterface.kt

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package app.cash.zipline.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.ScopeWithIr
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.IrElement

zipline-kotlin-plugin/src/main/kotlin/app/cash/zipline/kotlin/CallAdapterConstructorRewriter.kt

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package app.cash.zipline.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.ScopeWithIr
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent

zipline-kotlin-plugin/src/main/kotlin/app/cash/zipline/kotlin/ZiplineApis.kt

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package app.cash.zipline.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
@@ -56,7 +59,7 @@ internal class ZiplineApis private constructor(
     val ziplineServiceClassId = ziplineFqPackage.classId("ZiplineService")
     private val ziplineServiceSerializerFunctionCallableId = ziplineFqPackage.callableId("ziplineServiceSerializer")
     private val ziplineServiceAdapterFunctionCallableId = bridgeFqPackage.callableId("ziplineServiceAdapter")
-    private val ziplineServiceAdapterClassId = bridgeFqPackage.classId("ZiplineServiceAdapter")
+    val ziplineServiceAdapterClassId = bridgeFqPackage.classId("ZiplineServiceAdapter")
     private val endpointClassId = bridgeFqPackage.classId("Endpoint")
     private val suspendCallbackClassId = bridgeFqPackage.classId("SuspendCallback")
     private val flowFqPackage = FqPackageName("kotlinx.coroutines.flow")

zipline-kotlin-plugin/src/main/kotlin/app/cash/zipline/kotlin/ir.kt

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package app.cash.zipline.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.ScopeWithIr
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder