Kotlin 1.9.20 (#233)

* Fully support use of Kotlin EAP versions
* Remove workaround for failing K2 toString on native target (KT-61616)
* Remove explicit declarations workaround (KT-61627)
* Use a local copy of Kotlin Compile Testing: tschuchortdev/kotlin-compile-testing#394 works as needed, but isn't released
* Update version table

Author: drewhamilton

.idea/kotlinc.xml

@@ -71,7 +71,7 @@ exclusively compatible with specific versions of Poko.
 
 | Kotlin version  | Poko version |
 |-----------------|--------------|
-| 1.9.0           | 0.15.0       |
+| 1.9.0 – 1.9.20  | 0.15.0       |
 | 1.8.20 – 1.8.22 | 0.13.1       |
 | 1.8.0 – 1.8.10  | 0.12.0       |
 | 1.7.0 – 1.7.21  | 0.11.0       |

README.md

@@ -1,12 +1,14 @@
 [versions]
 
 # https://androidx.dev/storage/compose-compiler/repository for versions matching new Kotlin versions:
-androidx-compose-compiler = "1.5.3"
+androidx-compose-compiler = "1.5.4-dev-k1.9.20-50f08dfa4b4"
 androidx-compose-runtime = "1.5.4"
-kotlin = "1.9.10"
-kotlinCompileTesting = "1.5.0"
+kotlin = "1.9.20"
+# If this ends with "-local", we use a checked-in jar instead of the public artifact:
+kotlinCompileTesting = "1.5.1-pr394-local"
 kotlinCompileTestingFork = "0.3.2"
-ksp = "1.9.10-1.0.13"
+# https://github.com/google/ksp/releases:
+ksp = "1.9.20-1.0.13"
 
 [libraries]
 

gradle/libs.versions.toml

@@ -20,10 +20,21 @@ dependencies {
 
     testImplementation(project(":poko-annotations"))
     testImplementation(libs.kotlin.embeddableCompiler)
-    testImplementation(libs.kotlin.compileTesting)
     testImplementation(libs.junit)
     testImplementation(libs.assertk)
     testImplementation(libs.testParameterInjector)
+    val kctVersion = libs.versions.kotlinCompileTesting.get()
+    if (kctVersion.endsWith("-local")) {
+        // Include the local KCT jar and its copied dependencies
+        val kctName = libs.kotlin.compileTesting.get().name
+        testImplementation(files("libs/$kctName-$kctVersion.jar"))
+        // Copied from KCT's build.gradle:
+        testImplementation("com.squareup.okio:okio:3.3.0")
+        testImplementation("io.github.classgraph:classgraph:4.8.158")
+        testImplementation("org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:${libs.versions.kotlin.get()}")
+    } else {
+        testImplementation(libs.kotlin.compileTesting)
+    }
 }
 
 tasks.withType<KotlinCompile>().configureEach {

poko-compiler-plugin/build.gradle.kts

@@ -3,7 +3,6 @@ package dev.drewhamilton.poko.ir
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.ir.IrBuiltIns
 import org.jetbrains.kotlin.ir.builders.IrBlockBodyBuilder
 import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
 import org.jetbrains.kotlin.ir.builders.IrGeneratorContextInterface
@@ -32,8 +31,6 @@ import org.jetbrains.kotlin.ir.util.render
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.name.StandardClassIds
-import org.jetbrains.kotlin.util.OperatorNameConventions
 
 context(IrGeneratorContextInterface)
 internal fun IrFunction.isToString(): Boolean {
@@ -156,28 +153,14 @@ private fun IrBlockBodyBuilder.irRuntimeArrayContentDeepToString(
 
             irElseBranch(
                 irCallToStringFunction(
-                    toStringFunctionSymbol = context.irBuiltIns.extensionToStringSafe(),
+                    toStringFunctionSymbol = context.irBuiltIns.extensionToString,
                     value = value,
                 ),
             ),
         ),
     )
 }
 
-// TODO: Remove when https://youtrack.jetbrains.com/issue/KT-61616 is fixed
-private fun IrBuiltIns.extensionToStringSafe(): IrSimpleFunctionSymbol {
-    return try {
-        extensionToString
-    } catch (exception: IllegalArgumentException) {
-        findFunctions(
-            OperatorNameConventions.TO_STRING,
-            StandardClassIds.BASE_KOTLIN_PACKAGE,
-        ).first { function ->
-            function.owner.extensionReceiverParameter?.type == anyNType
-        }
-    }
-}
-
 /**
  * Generates a runtime `when` branch computing the content deep toString of [value]. The branch is
  * only executed if [value] is an instance of [classSymbol].

poko-compiler-plugin/libs/kotlin-compile-testing-1.5.1-pr394-local.jar

@@ -1,9 +1,7 @@
 package dev.drewhamilton.poko
 
-import assertk.all
 import assertk.assertThat
 import assertk.assertions.contains
-import assertk.assertions.doesNotContain
 import assertk.assertions.isEqualTo
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterInjector
@@ -184,7 +182,6 @@ class PokoCompilerPluginTest(
         sources = sourceFiles.asList()
         verbose = false
         jvmTarget = JvmTarget.JVM_1_8.description
-        useIR = true
         if (k2) {
             languageVersion = "2.0"
         }

poko-compiler-plugin/src/main/kotlin/dev/drewhamilton/poko/ir/toStringGeneration.kt

@@ -7,10 +7,9 @@ import kotlin.test.Test
 import poko.GenericArrayHolder
 
 class GenericArrayHolderTest {
-    @Suppress("RemoveExplicitTypeArguments") // https://youtrack.jetbrains.com/issue/KT-61627
     @Test fun two_GenericArrayHolder_instances_with_equivalent_typed_arrays_are_equals() {
-        val a = GenericArrayHolder(arrayOf<Any>(arrayOf("5%, 10%"), intArrayOf(5, 10), booleanArrayOf(false, true)))
-        val b = GenericArrayHolder(arrayOf<Any>(arrayOf("5%, 10%"), intArrayOf(5, 10), booleanArrayOf(false, true)))
+        val a = GenericArrayHolder(arrayOf(arrayOf("5%, 10%"), intArrayOf(5, 10), booleanArrayOf(false, true)))
+        val b = GenericArrayHolder(arrayOf(arrayOf("5%, 10%"), intArrayOf(5, 10), booleanArrayOf(false, true)))
         assertThat(a).isEqualTo(b)
         assertThat(b).isEqualTo(a)
         assertThat(a).hashCodeFun().isEqualTo(b.hashCode())

poko-compiler-plugin/src/test/kotlin/dev/drewhamilton/poko/PokoCompilerPluginTest.kt

@@ -30,6 +30,11 @@ allprojects {
             }
         }
         mavenCentral()
+
+        if (rootProject.property("kotlin_dev_version_enabled") == "true") {
+            logger.lifecycle("Adding Kotlin dev repository for ${this@allprojects}")
+            maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") }
+        }
     }
 
     plugins.withId("org.jetbrains.kotlin.jvm") {

poko-tests/src/commonTest/kotlin/GenericArrayHolderTest.kt

@@ -20,6 +20,11 @@ pluginManagement {
         }
         mavenCentral()
         google()
+
+        if (extra["kotlin_dev_version_enabled"] == "true") {
+            logger.lifecycle("Adding Kotlin dev repository for plugins")
+            maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") }
+        }
     }
 
     resolutionStrategy {