Update dependency com.pinterest.ktlint:ktlint-cli to v1.4.1

renovate[bot] · jrodbx · commit c13e188d5660 · 2024-11-06T23:08:35.000-05:00
diff --git a/.editorconfig b/.editorconfig
@@ -17,4 +17,7 @@ ij_kotlin_allow_trailing_comma_on_call_site = false
 ktlint_standard_argument-list-wrapping = disabled
 ktlint_standard_class-signature = disabled
 ktlint_standard_function-expression-body = disabled
+ktlint_function_signature_body_expression_wrapping = multiline
 ktlint_function_naming_ignore_when_annotated_with = Composable
+
+max_line_length = 120
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 
-ktlint-core = "com.pinterest.ktlint:ktlint-cli:1.3.1"
+ktlint-core = "com.pinterest.ktlint:ktlint-cli:1.4.1"
 
 kxml2 = { module = "kxml2:kxml2", version = "2.3.0" }
 
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt
@@ -125,7 +125,8 @@ public class PaparazziPlugin @Inject constructor(
       val projectDirectory = project.layout.projectDirectory
       val buildDirectory = project.layout.buildDirectory
       val gradleUserHomeDir = project.gradle.gradleUserHomeDir
-      val reportOutputDir = project.extensions.getByType(ReportingExtension::class.java).baseDirectory.dir("paparazzi/${variant.name}")
+      val reportOutputDir =
+        project.extensions.getByType(ReportingExtension::class.java).baseDirectory.dir("paparazzi/${variant.name}")
 
       val testInstrumentation = testVariant.instrumentation
       testInstrumentation.transformClassesWith(
@@ -343,8 +344,7 @@ public class PaparazziPlugin @Inject constructor(
     configurations.getByName("testImplementation").dependencies.add(dependency)
   }
 
-  private fun Project.isInternal(): Boolean =
-    providers.gradleProperty("app.cash.paparazzi.internal").orNull == "true"
+  private fun Project.isInternal(): Boolean = providers.gradleProperty("app.cash.paparazzi.internal").orNull == "true"
 
   private fun BaseExtension.packageName(): String = namespace ?: ""
 
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/instrumentation/ResourcesCompatVisitorFactory.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/instrumentation/ResourcesCompatVisitorFactory.kt
@@ -9,15 +9,11 @@ import org.objectweb.asm.MethodVisitor
 import org.objectweb.asm.Opcodes
 
 internal abstract class ResourcesCompatVisitorFactory : AsmClassVisitorFactory<InstrumentationParameters.None> {
-  override fun createClassVisitor(
-    classContext: ClassContext,
-    nextClassVisitor: ClassVisitor
-  ): ClassVisitor {
+  override fun createClassVisitor(classContext: ClassContext, nextClassVisitor: ClassVisitor): ClassVisitor {
     return ResourcesCompatTransform(nextClassVisitor)
   }
 
-  override fun isInstrumentable(classData: ClassData): Boolean =
-    classData.className == RESOURCES_COMPAT_CLASS_NAME
+  override fun isInstrumentable(classData: ClassData): Boolean = classData.className == RESOURCES_COMPAT_CLASS_NAME
 
   /**
    * [ClassVisitor] that fixes a hardcoded path in ResourcesCompat.loadFont.
@@ -43,13 +39,7 @@ internal abstract class ResourcesCompatVisitorFactory : AsmClassVisitorFactory<I
     }
 
     private class LoadFontVisitor(api: Int, delegate: MethodVisitor) : MethodVisitor(api, delegate) {
-      override fun visitMethodInsn(
-        opcode: Int,
-        owner: String,
-        name: String,
-        descriptor: String,
-        isInterface: Boolean
-      ) {
+      override fun visitMethodInsn(opcode: Int, owner: String, name: String, descriptor: String, isInterface: Boolean) {
         if ("startsWith" == name) {
           super.visitMethodInsn(opcode, owner, "contains", "(Ljava/lang/CharSequence;)Z", isInterface)
         } else {
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/AllTestResults.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/AllTestResults.kt
@@ -32,11 +32,7 @@ internal class AllTestResults : CompositeTestResults(null) {
     )
   }
 
-  fun addTestClass(
-    classId: Long,
-    className: String,
-    classDisplayName: String = className
-  ): ClassTestResults {
+  fun addTestClass(classId: Long, className: String, classDisplayName: String = className): ClassTestResults {
     return addPackageForClass(className).addClass(classId, className, classDisplayName)
   }
 
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/ClassPageRenderer.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/ClassPageRenderer.kt
@@ -72,10 +72,7 @@ internal class ClassPageRenderer(
     htmlWriter.endElement()
   }
 
-  private fun determineTableRow(
-    test: TestResult,
-    methodNameColumnExists: Boolean
-  ): List<String> =
+  private fun determineTableRow(test: TestResult, methodNameColumnExists: Boolean): List<String> =
     if (methodNameColumnExists) {
       listOf(
         test.displayName,
@@ -108,11 +105,7 @@ internal class ClassPageRenderer(
   }
 
   @Throws(IOException::class)
-  private fun renderTableRow(
-    writer: SimpleMarkupWriter,
-    test: TestResult,
-    rowCells: List<String>
-  ) {
+  private fun renderTableRow(writer: SimpleMarkupWriter, test: TestResult, rowCells: List<String>) {
     writer.startElement("tr")
     for (cell in rowCells) {
       writer
@@ -124,8 +117,7 @@ internal class ClassPageRenderer(
     writer.endElement()
   }
 
-  private fun methodNameColumnExists(): Boolean =
-    results.testResults.any { it.name != it.displayName }
+  private fun methodNameColumnExists(): Boolean = results.testResults.any { it.name != it.displayName }
 
   @Throws(IOException::class)
   override fun renderFailures(htmlWriter: SimpleHtmlWriter) {
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/PackageTestResults.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/PackageTestResults.kt
@@ -32,11 +32,7 @@ internal class PackageTestResults(
     return addTest(classResults.addTest(testName, testDisplayName, duration)!!)
   }
 
-  fun addClass(
-    classId: Long,
-    className: String,
-    classDisplayName: String = className
-  ): ClassTestResults {
+  fun addClass(classId: Long, className: String, classDisplayName: String = className): ClassTestResults {
     var classResults = classes[className]
     if (classResults == null) {
       classResults = ClassTestResults(classId, className, classDisplayName, this)
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/PaparazziTestReporter.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/reporting/PaparazziTestReporter.kt
@@ -70,11 +70,7 @@ internal class PaparazziTestReporter(
     return model
   }
 
-  private fun generateFiles(
-    model: AllTestResults,
-    resultsProvider: TestResultsProvider,
-    reportDir: File
-  ) {
+  private fun generateFiles(model: AllTestResults, resultsProvider: TestResultsProvider, reportDir: File) {
     try {
       val htmlRenderer = HtmlReportRenderer()
       buildOperationRunner.run(object : RunnableBuildOperation {
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/utils/Artifacts.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/utils/Artifacts.kt
@@ -24,8 +24,7 @@ import org.gradle.api.artifacts.type.ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIB
 internal fun Configuration.artifactsFor(
   attrValue: String,
   componentFilter: (ComponentIdentifier) -> Boolean = { true }
-): ArtifactCollection =
-  artifactViewFor(attrValue, componentFilter).artifacts
+): ArtifactCollection = artifactViewFor(attrValue, componentFilter).artifacts
 
 internal fun Configuration.artifactViewFor(
   attrValue: String,
diff --git a/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/ImageSubject.kt b/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/ImageSubject.kt
@@ -55,10 +55,7 @@ internal class ImageSubject private constructor(
       }
     }
 
-    private fun getDifferencePercent(
-      img1: BufferedImage,
-      img2: BufferedImage
-    ): Double {
+    private fun getDifferencePercent(img1: BufferedImage, img2: BufferedImage): Double {
       val width = img1.width
       val height = img1.height
       val width2 = img2.width
@@ -97,7 +94,6 @@ internal class ImageSubject private constructor(
       ImageSubject(metadata, actual)
     }
 
-    fun assertThat(actual: File?): ImageSubject =
-      assertAbout(IMAGE_SUBJECT_FACTORY).that(actual)
+    fun assertThat(actual: File?): ImageSubject = assertAbout(IMAGE_SUBJECT_FACTORY).that(actual)
   }
 }
diff --git a/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt b/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
@@ -944,7 +944,8 @@ class PaparazziPluginTest {
     val resourcesFile = File(consumerModuleRoot, "build/intermediates/paparazzi/debug/resources.json")
 
     var config = resourcesFile.loadConfig()
-    assertThat(config.moduleResourceDirs).containsExactly("../producer/build/intermediates/packaged_res/debug/packageDebugResources")
+    assertThat(config.moduleResourceDirs)
+      .containsExactly("../producer/build/intermediates/packaged_res/debug/packageDebugResources")
 
     buildDir.deleteRecursively()
 
@@ -966,7 +967,8 @@ class PaparazziPluginTest {
     }
 
     config = resourcesFile.loadConfig()
-    assertThat(config.moduleResourceDirs).containsExactly("../producer/build/intermediates/packaged_res/debug/packageDebugResources")
+    assertThat(config.moduleResourceDirs)
+      .containsExactly("../producer/build/intermediates/packaged_res/debug/packageDebugResources")
   }
 
   @Test
@@ -1387,6 +1389,7 @@ class PaparazziPluginTest {
   }
 
   @Test
+  @Suppress("ktlint:standard:max-line-length")
   fun snapshotReport() {
     val fixtureRoot = File("src/test/projects/report-snapshots")
     val testReportDir = File(fixtureRoot, "build/reports/tests/testDebugUnitTest/classes")
@@ -1404,7 +1407,8 @@ class PaparazziPluginTest {
     assertThat(htmlText).contains("<img")
     assertThat(htmlText).contains("delta-app.cash.paparazzi.plugin.test_SimpleTest_compose.png")
 
-    val testParamInjectorTestHtmlFile = File(testReportDir, "app.cash.paparazzi.plugin.test.TestParameterInjectorTest.html")
+    val testParamInjectorTestHtmlFile =
+      File(testReportDir, "app.cash.paparazzi.plugin.test.TestParameterInjectorTest.html")
     htmlText = testParamInjectorTestHtmlFile.readText()
     assertThat(htmlText).contains("<img")
     assertThat(htmlText).contains("delta-app.cash.paparazzi.plugin.test_TestParameterInjectorTest_compose[darkMode=false,fontScale=1.0].png")
@@ -1541,10 +1545,7 @@ class PaparazziPluginTest {
 
   private fun File.loadConfig() = source().buffer().use { CONFIG_ADAPTER.fromJson(it)!! }
 
-  private fun GradleRunner.runFixture(
-    projectRoot: File,
-    action: GradleRunner.() -> BuildResult
-  ): BuildResult {
+  private fun GradleRunner.runFixture(projectRoot: File, action: GradleRunner.() -> BuildResult): BuildResult {
     val settings = File(projectRoot, "settings.gradle")
     val gradleProperties = File(projectRoot, "gradle.properties")
     var generatedSettings = false
diff --git a/paparazzi-gradle-plugin/src/test/projects/invalid-chars/src/test/java/app/cash/paparazzi/plugin/test/InvalidCharsTest.kt b/paparazzi-gradle-plugin/src/test/projects/invalid-chars/src/test/java/app/cash/paparazzi/plugin/test/InvalidCharsTest.kt
@@ -39,9 +39,7 @@ class InvalidCharsTest {
   }
 
   @Test
-  fun badValues(
-    @TestParameter(valuesProvider = MathOperatorProvider::class) char: Char
-  ) {
+  fun badValues(@TestParameter(valuesProvider = MathOperatorProvider::class) char: Char) {
     paparazzi.snapshot {
       Text(
         text = char.toString(),
@@ -51,9 +49,7 @@ class InvalidCharsTest {
   }
 
   @Test
-  fun goodValues(
-    @TestParameter operation: MathOperation
-  ) {
+  fun goodValues(@TestParameter operation: MathOperation) {
     paparazzi.snapshot {
       Text(
         text = operation.operator.toString(),
@@ -63,8 +59,7 @@ class InvalidCharsTest {
   }
 
   object MathOperatorProvider : TestParameterValuesProvider() {
-    override fun provideValues(context: Context): List<Char> =
-      listOf('+', '-', '*', '/')
+    override fun provideValues(context: Context): List<Char> = listOf('+', '-', '*', '/')
   }
 
   enum class MathOperation(val operator: Char) {
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-recyclerview/src/main/java/app/cash/paparazzi/plugin/test/PaparazziRecyclerView.kt b/paparazzi-gradle-plugin/src/test/projects/verify-recyclerview/src/main/java/app/cash/paparazzi/plugin/test/PaparazziRecyclerView.kt
@@ -9,8 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 class PaparazziRecyclerView(context: Context, attrs: AttributeSet) : RecyclerView(context, attrs) {
   class ViewHolder(val view: TextView) : RecyclerView.ViewHolder(view)
   class Adapter : RecyclerView.Adapter<ViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
-      ViewHolder(TextView(parent.context))
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(TextView(parent.context))
 
     override fun getItemCount(): Int = 5
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
diff --git a/paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/PaparazziPoet.kt b/paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/PaparazziPoet.kt
diff --git a/paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/PreviewProcessor.kt b/paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/PreviewProcessor.kt
diff --git a/paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/Utils.kt b/paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/Utils.kt
diff --git a/paparazzi/src/main/java/app/cash/paparazzi/internal/PaparazziCallback.kt b/paparazzi/src/main/java/app/cash/paparazzi/internal/PaparazziCallback.kt
diff --git a/paparazzi/src/main/java/app/cash/paparazzi/internal/resources/PseudolocaleGenerator.kt b/paparazzi/src/main/java/app/cash/paparazzi/internal/resources/PseudolocaleGenerator.kt
diff --git a/paparazzi/src/main/java/app/cash/paparazzi/internal/resources/RepositoryLoader.kt b/paparazzi/src/main/java/app/cash/paparazzi/internal/resources/RepositoryLoader.kt

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,7 @@ internal class AllTestResults : CompositeTestResults(null) {`
`32`	`32`	`)`
`33`	`33`	`}`
`34`	`34`
`35`		`- fun addTestClass(`
`36`		`- classId: Long,`
`37`		`- className: String,`
`38`		`- classDisplayName: String = className`
`39`		`- ): ClassTestResults {`
	`35`	`+ fun addTestClass(classId: Long, className: String, classDisplayName: String = className): ClassTestResults {`
`40`	`36`	`return addPackageForClass(className).addClass(classId, className, classDisplayName)`
`41`	`37`	`}`
`42`	`38`
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,7 @@ internal class ImageSubject private constructor(`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- private fun getDifferencePercent(`
`59`		`- img1: BufferedImage,`
`60`		`- img2: BufferedImage`
`61`		`- ): Double {`
	`58`	`+ private fun getDifferencePercent(img1: BufferedImage, img2: BufferedImage): Double {`
`62`	`59`	`val width = img1.width`
`63`	`60`	`val height = img1.height`
`64`	`61`	`val width2 = img2.width`
`@@ -97,7 +94,6 @@ internal class ImageSubject private constructor(`
`97`	`94`	`ImageSubject(metadata, actual)`
`98`	`95`	`}`
`99`	`96`
`100`		`- fun assertThat(actual: File?): ImageSubject =`
`101`		`- assertAbout(IMAGE_SUBJECT_FACTORY).that(actual)`
	`97`	`+ fun assertThat(actual: File?): ImageSubject = assertAbout(IMAGE_SUBJECT_FACTORY).that(actual)`
`102`	`98`	`}`
`103`	`99`	`}`