Update dependencies (#1240)

* Update dependencies * Fix type argument mapping when processing typealiases with KSP
square · Apr 21, 2022 · 6a83bdc · 6a83bdc
1 parent 7c2d9f4
commit 6a83bdc
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,7 +40,7 @@ allprojects {
 subprojects {
   tasks.withType<KotlinCompile> {
     kotlinOptions {
-      freeCompilerArgs += listOf("-Xopt-in=kotlin.RequiresOptIn")
+      freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
     }
   }
   // Ensure "org.gradle.jvm.version" is set to "8" in Gradle metadata.

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,14 +13,14 @@
 # limitations under the License.
 
 [versions]
-kotlin = "1.6.10"
-kct = "1.4.6"
-ksp = "1.6.0-1.0.1"
+kotlin = "1.6.21"
+kct = "1.4.8"
+ksp = "1.6.20-1.0.5"
 ktlint = "0.42.1"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-dokka = { id = "org.jetbrains.dokka", version = "1.6.10" }
+dokka = { id = "org.jetbrains.dokka", version = "1.6.20" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 spotless = { id = "com.diffplug.spotless", version = "6.2.1" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.18.0" }

diff --git a/interop/kotlinx-metadata/build.gradle.kts b/interop/kotlinx-metadata/build.gradle.kts
@@ -22,7 +22,10 @@ tasks.jar {
 
 tasks.compileTestKotlin {
   kotlinOptions {
-    freeCompilerArgs = listOf("-Xjvm-default=all")
+    freeCompilerArgs = listOf(
+      "-Xjvm-default=all",
+      "-opt-in=com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview",
+    )
   }
 }
 

diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksTypes.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksTypes.kt
@@ -75,9 +75,17 @@ internal fun KSType.toTypeName(
       } else {
         decl.typeParameters.toTypeParameterResolver(typeParamResolver)
       }
-      val mappedArgs = arguments.map { it.toTypeName(typeParamResolver) }
 
-      val abbreviatedType = decl.type.resolve()
+      val resolvedType = decl.type.resolve()
+      val mappedArgs = mapTypeAliasArgsToAbbreviatedTypeArgs(
+        typeParamResolver = typeParamResolver,
+        typeAliasTypeParams = decl.typeParameters,
+        typeAliasTypeArgs = arguments,
+        abbreviatedTypeParams = resolvedType.declaration.typeParameters,
+        abbreviatedTypeArgs = resolvedType.arguments,
+      )
+
+      val abbreviatedType = resolvedType
         .toTypeName(extraResolver)
         .copy(nullable = isMarkedNullable)
         .rawType()
@@ -95,6 +103,30 @@ internal fun KSType.toTypeName(
   return type.copy(nullable = isMarkedNullable)
 }
 
+@KotlinPoetKspPreview
+private fun mapTypeAliasArgsToAbbreviatedTypeArgs(
+  typeParamResolver: TypeParameterResolver,
+  typeAliasTypeParams: List<KSTypeParameter>,
+  typeAliasTypeArgs: List<KSTypeArgument>,
+  abbreviatedTypeParams: List<KSTypeParameter>,
+  abbreviatedTypeArgs: List<KSTypeArgument>,
+): List<TypeName> {
+  val orderedAbbreviatedTypeArgs = if (typeAliasTypeParams.size < 2) {
+    // egor: If there's only one type parameter, KSP might use different names for it in typealias vs abbreviated type
+    // (not sure why), so we'll return early - order doesn't matter when there are less than 2 parameters.
+    abbreviatedTypeArgs
+  } else {
+    abbreviatedTypeParams
+      .map { abbreviatedTypeParam ->
+        typeAliasTypeParams.indexOfFirst { typeAliasTypeParam ->
+          abbreviatedTypeParam.name.asString() == typeAliasTypeParam.name.asString()
+        }
+      }
+      .map(typeAliasTypeArgs::get)
+  }
+  return orderedAbbreviatedTypeArgs.map { it.toTypeName(typeParamResolver) }
+}
+
 /**
  * Returns a [TypeVariableName] representation of this [KSTypeParameter].
  *

diff --git a/interop/ksp/test-processor/build.gradle.kts b/interop/ksp/test-processor/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
   kotlinOptions {
     @Suppress("SuspiciousCollectionReassignment")
-    freeCompilerArgs += listOf("-Xopt-in=com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview")
+    freeCompilerArgs += listOf("-opt-in=com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview")
   }
 }
 

diff --git a/kotlinpoet/build.gradle.kts b/kotlinpoet/build.gradle.kts
@@ -22,7 +22,7 @@ tasks.jar {
 
 tasks.compileTestKotlin {
   kotlinOptions {
-    freeCompilerArgs = listOf("-Xopt-in=com.squareup.kotlinpoet.DelicateKotlinPoetApi")
+    freeCompilerArgs = listOf("-opt-in=com.squareup.kotlinpoet.DelicateKotlinPoetApi")
   }
 }