Prepare for Kotlin 1.9.20 (#495)

* Update kotlin to 1.9.20-beta * Update some APIs * Update KCT * Update more * Update CI * KCT final
ZacSweers · Oct 31, 2023 · 9edf277 · 9edf277
1 parent f3e526d
commit 9edf277
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         java: [ '20' ]
-        kotlin: [ '1.9.10' ]
+        kotlin: [ '1.9.20' ]
         ksp_enabled: [ true, false ]
         k2_enabled: [ true, false ]
       fail-fast: false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,10 +19,10 @@ gjf = "1.13.0"
 incap = "1.0.0"
 jdk = "20"
 jvmTarget = "11"
-kotlin = "1.9.10"
-kotlinCompileTesting = "0.3.2"
+kotlin = "1.9.20"
+kotlinCompileTesting = "0.4.0"
 kotlinpoet = "1.14.2"
-ksp = "1.9.10-1.0.13"
+ksp = "1.9.20-1.0.13"
 ktfmt = "0.46"
 moshi = "1.15.0"
 okhttp = "4.12.0"

diff --git a/...-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/util/IrSourcePrinter.kt b/...-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/util/IrSourcePrinter.kt
@@ -1382,7 +1382,7 @@ internal class IrSourcePrinterVisitor(
       if (parent is IrDeclaration) {
         parent.renderDeclarationFqn(sb)
       } else if (parent is IrPackageFragment) {
-        sb.append(parent.fqName.toString())
+        sb.append(parent.packageFqName.toString())
       }
     } catch (e: UninitializedPropertyAccessException) {
       sb.append("<uninitialized parent>")

diff --git a/moshi-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/util/ir.kt b/moshi-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/util/ir.kt
@@ -133,12 +133,12 @@ internal fun IrConstructor.irConstructorBody(
       endOffset = endOffset
     )
   body =
-    context.irFactory.createBlockBody(
-      startOffset = startOffset,
-      endOffset = endOffset,
-    ) {
-      constructorIrBuilder.blockBody(statements)
-    }
+    context.irFactory
+      .createBlockBody(
+        startOffset = startOffset,
+        endOffset = endOffset,
+      )
+      .apply { constructorIrBuilder.blockBody(statements) }
 }
 
 internal fun DeclarationIrBuilder.irInstanceInitializerCall(