Update dependency com.facebook:ktfmt to v0.46 (#494)

* Update dependency com.facebook:ktfmt to v0.46 * Spotless --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers <[email protected]>
ZacSweers · Oct 24, 2023 · f3e526d · f3e526d
1 parent 042573e
commit f3e526d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 18 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ kotlin = "1.9.10"
 kotlinCompileTesting = "0.3.2"
 kotlinpoet = "1.14.2"
 ksp = "1.9.10-1.0.13"
-ktfmt = "0.44"
+ktfmt = "0.46"
 moshi = "1.15.0"
 okhttp = "4.12.0"
 retrofit = "2.9.0"

diff --git a/moshi-adapters/src/main/kotlin/dev/zacsweers/moshix/adapters/AdaptedBy.kt b/moshi-adapters/src/main/kotlin/dev/zacsweers/moshix/adapters/AdaptedBy.kt
@@ -114,8 +114,7 @@ public annotation class AdaptedBy(val adapter: KClass<*>, val nullSafe: Boolean
                 "value must be a JsonAdapter or JsonAdapter.Factory."
             )
           }
-        }
-          ?: return null
+        } ?: return null
 
       return if (adaptedBy.nullSafe) {
         adapter.nullSafe()

diff --git a/...-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/MoshiIrUtil.kt b/...-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/MoshiIrUtil.kt
@@ -110,8 +110,7 @@ internal fun TargetProperty.generator(
     val qualifierRawType = jsonQualifier.type.classOrNull!!.owner
     val retentionValue =
       qualifierRawType.getAnnotation(FqName("kotlin.annotation.Retention"))?.getValueArgument(0)
-        as IrGetEnumValue?
-        ?: continue
+        as IrGetEnumValue? ?: continue
     // TODO what about java qualifiers types?
     val retention = retentionValue.symbol.owner.name.identifier
     // Check Java types since that covers both Java and Kotlin annotations.

diff --git a/...-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/sealed/SealedAdapterGenerator.kt b/...-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/sealed/SealedAdapterGenerator.kt
@@ -481,8 +481,7 @@ private constructor(
                     targetType = targetType.defaultType,
                     moshiParam = moshiParam
                   )
-                }
-                  ?: subtypesExpression
+                } ?: subtypesExpression
 
               // .create(Message::class.java, emptySet(), moshi) as JsonAdapter<Message>
               irExprBody(

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
@@ -919,7 +919,8 @@ internal class IrSourcePrinterVisitor(
     print(": ")
     val type =
       declaration.backingField?.type
-        ?: declaration.getter?.returnType ?: error("Couldn't find return type")
+        ?: declaration.getter?.returnType
+        ?: error("Couldn't find return type")
     print(type.renderSrc())
     declaration.backingField?.let { field ->
       field.initializer?.let { initializer ->

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
@@ -199,8 +199,9 @@ internal fun IrBuilderWithScope.defaultPrimitiveValue(
 internal val IrProperty.type: IrType
   get() =
     getter?.returnType
-      ?: setter?.valueParameters?.first()?.type ?: backingField?.type
-        ?: error("No type for property $name")
+      ?: setter?.valueParameters?.first()?.type
+      ?: backingField?.type
+      ?: error("No type for property $name")
 
 internal fun DescriptorVisibility.checkIsVisible() {
   if (this != DescriptorVisibilities.PUBLIC && this != DescriptorVisibilities.INTERNAL) {

diff --git a/moshi-metadata-reflect/src/main/kotlin/dev/zacsweers/moshix/reflect/JvmDescriptors.kt b/moshi-metadata-reflect/src/main/kotlin/dev/zacsweers/moshix/reflect/JvmDescriptors.kt
@@ -35,7 +35,8 @@ private val PRIMITIVE_CLASS_TO_DESC =
 internal val Class<*>.descriptor: String
   get() {
     return when {
-      isPrimitive -> PRIMITIVE_CLASS_TO_DESC[this]?.toString()
+      isPrimitive ->
+        PRIMITIVE_CLASS_TO_DESC[this]?.toString()
           ?: throw RuntimeException("Unrecognized primitive $this")
       isArray -> "[${componentType.descriptor}"
       else -> "L$name;".replace('.', '/')

diff --git a/moshi-metadata-reflect/src/main/kotlin/dev/zacsweers/moshix/reflect/KtTypes.kt b/moshi-metadata-reflect/src/main/kotlin/dev/zacsweers/moshix/reflect/KtTypes.kt
@@ -217,8 +217,9 @@ internal data class KtProperty(
 
   val javaType =
     jvmField?.genericType
-      ?: jvmGetter?.genericReturnType ?: jvmSetter?.genericReturnType
-        ?: error(
+      ?: jvmGetter?.genericReturnType
+      ?: jvmSetter?.genericReturnType
+      ?: error(
         "No type information available for property '${km.name}' with type '${km.returnType.canonicalName}'."
       )
 

diff --git a/...main/kotlin/dev/zacsweers/moshix/sealed/codegen/ksp/MoshiSealedSymbolProcessorProvider.kt b/...main/kotlin/dev/zacsweers/moshix/sealed/codegen/ksp/MoshiSealedSymbolProcessorProvider.kt
@@ -414,7 +414,7 @@ private class MoshiSealedSymbolProcessor(environment: SymbolProcessorEnvironment
     val alternates =
       labelAnnotation.arguments.find { it.name?.getShortName() == "alternateLabels" }?.value
         as? List<String> // arrays are lists in KSP https://github.com/google/ksp/issues/135
-       ?: emptyList() // ksp ignores undefined args
+      ?: emptyList() // ksp ignores undefined args
 
     for (alternate in alternates) {
       seenLabels.put(alternate, className)?.let { prev ->

diff --git a/.../main/kotlin/dev/zacsweers/moshix/sealed/reflect/MetadataMoshiSealedJsonAdapterFactory.kt b/.../main/kotlin/dev/zacsweers/moshix/sealed/reflect/MetadataMoshiSealedJsonAdapterFactory.kt
@@ -64,8 +64,7 @@ public class MetadataMoshiSealedJsonAdapterFactory : JsonAdapter.Factory {
         val parentLabelKey =
           supertypes.firstNotNullOfOrNull { supertype ->
             supertype.getAnnotation(JsonClass::class.java)?.labelKey()
-          }
-            ?: error("No JsonClass-annotated sealed supertype found for $rawType")
+          } ?: error("No JsonClass-annotated sealed supertype found for $rawType")
         check(parentLabelKey != labelKey) {
           "@NestedSealed-annotated subtype $rawType is inappropriately annotated with @JsonClass(generator = \"sealed:$labelKey\")."
         }

diff --git a/...lect/src/main/kotlin/dev/zacsweers/moshix/sealed/reflect/MoshiSealedJsonAdapterFactory.kt b/...lect/src/main/kotlin/dev/zacsweers/moshix/sealed/reflect/MoshiSealedJsonAdapterFactory.kt
@@ -58,8 +58,7 @@ public class MoshiSealedJsonAdapterFactory : JsonAdapter.Factory {
               (supertype.classifier as? KClass<*>)?.findAnnotation<JsonClass>()
                 ?: supertype.findAnnotation()
             nestedJsonClass?.labelKey()
-          }
-            ?: error("No JsonClass-annotated sealed supertype found for $rawTypeKotlin")
+          } ?: error("No JsonClass-annotated sealed supertype found for $rawTypeKotlin")
         check(parentLabelKey != labelKey) {
           "@NestedSealed-annotated subtype $rawType is inappropriately annotated with @JsonClass(generator = \"sealed:$labelKey\")."
         }