Update kotlinpoet to 1.5.0 (#144)

* Update kotlinpoet to 1.5.0 * After merging arrow-kt/arrow#2154 we need to create another PR to bring this line back! Co-authored-by: Paco <pakoito@users.noreply.github.com>
arrow-kt · Jun 8, 2020 · 56987c9 · 56987c9
1 parent 75d5db3
commit 56987c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/arrow-meta/build.gradle b/arrow-meta/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
     compile project(':arrow-annotations')
     compile "me.eugeniomarletti.kotlin.metadata:kotlin-metadata:$KOTLIN_METADATA_VERSION"
-    compile("com.squareup:kotlinpoet:$KOTLIN_POET_VERSION") {
+    compile("com.squareup:kotlinpoet:1.5.0") {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-reflect'
     }
     compile "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION"

diff --git a/arrow-meta/src/main/java/arrow/generic/CoproductFileGenerator.kt b/arrow-meta/src/main/java/arrow/generic/CoproductFileGenerator.kt
@@ -47,7 +47,7 @@ fun generateCoproducts(destination: File) {
   for (size in 2 until genericsToClassNames.size + 1) {
     val generics = genericsToClassNames.keys.toList().take(size)
 
-    FileSpec.builder("arrow.generic.coproduct$size", "Coproduct$size")
+    FileSpec.builder(coproductPackageName(size), "Coproduct$size")
       .apply {
         addCoproductClassDeclaration(generics)
         addExtensionConstructors(generics)
@@ -196,7 +196,7 @@ private fun methodDocumentation(
 private fun List<String>.toTypeParameters(): List<TypeVariableName> = map { TypeVariableName(it) }
 
 private fun parameterizedCoproductNClassName(generics: List<String>): ParameterizedTypeName =
-  ClassName("", "Coproduct${generics.size}")
+  ClassName(coproductPackageName(generics.size), "Coproduct${generics.size}")
     .parameterizedBy(*generics.map { TypeVariableName(it) }.toTypedArray())
 
 private fun additionalParameterSuppressAnnotation(count: Int): List<AnnotationSpec> =
@@ -215,3 +215,5 @@ private fun additionalParameterSpecs(count: Int): List<ParameterSpec> = List(cou
     .defaultValue("Unit")
     .build()
 }
+
+private fun coproductPackageName(size: Int) = "arrow.generic.coproduct$size"
diff --git a/arrow-meta/src/main/java/arrow/meta/decoder/Decoder.kt b/arrow-meta/src/main/java/arrow/meta/decoder/Decoder.kt
@@ -208,7 +208,8 @@ interface TypeDecoder : MetaDecoder<Type> {
     ).copy(suspending = modifiers.contains(Modifier.Suspend))
 
   fun TypeName.Classy.lyrics(): ClassName =
-    ClassName(packageName = pckg.value, simpleName = simpleName)
+    ClassName(packageName = pckg.value, simpleNames = listOf(simpleName))
+      .copy(nullable = nullable, annotations = annotations.map { it.lyrics() }, tags = emptyMap())
 
   fun TypeName.lyrics(): com.squareup.kotlinpoet.TypeName =
     when (this) {
@@ -223,7 +224,7 @@ interface TypeDecoder : MetaDecoder<Type> {
     Code(f().trimMargin())
 
   operator fun TypeName?.unaryPlus(): Code =
-    if (this != null) Code(CodeBlock.of("%T", this.lyrics()).toString())
+    if (this != null) Code(CodeBlock.of("%T", lyrics()).toString())
     else Code("")
 
   operator fun String.unaryPlus(): Code =