Update ktlint plugin to org.jlleitschuh.gradle.ktlint:13.1.0 and ktlint 1.7.1

Author: DanielJette

Ext/Accessibility/build.gradle

@@ -94,5 +94,3 @@ android {
 afterEvaluate {
     apply from: "../../publish.build.gradle"
 }
-
-apply from: '../../ktlint.gradle'

Ext/Compose/build.gradle

@@ -112,5 +112,3 @@ android {
 afterEvaluate {
     apply from: "../../publish.build.gradle"
 }
-
-apply from: '../../ktlint.gradle'

Ext/Fullscreen/build.gradle

@@ -92,5 +92,3 @@ android {
 afterEvaluate {
     apply from: "../../publish.build.gradle"
 }
-
-apply from: '../../ktlint.gradle'

Library/build.gradle

@@ -124,8 +124,6 @@ afterEvaluate {
     apply from: "../publish.build.gradle"
 }
 
-apply from: '../ktlint.gradle'
-
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']

Library/src/main/java/dev/testify/output/TestStorageDestination.kt

@@ -107,8 +107,9 @@ class TestStorageDestination(
                     if (outputStream == null) return false
                     val buffer = ByteArray(1024)
                     var length: Int
-                    while (inputStream.read(buffer).also { length = it } > 0)
+                    while (inputStream.read(buffer).also { length = it } > 0) {
                         outputStream.write(buffer, 0, length)
+                    }
                 }
             }
             return true

Library/src/main/java/dev/testify/scenario/ScreenshotScenarioRule.kt

@@ -301,19 +301,21 @@ open class ScreenshotScenarioRule @JvmOverloads constructor(
         scenario?.onActivity { activity = it }
 
         if (activity != null) {
-            if (configuration.fontScale != null)
+            if (configuration.fontScale != null) {
                 throw NoResourceConfigurationOnScenarioException(
                     cause = "fontScale",
                     value = configuration.fontScale.toString(),
                     activity = activity?.javaClass?.simpleName.orEmpty()
                 )
+            }
 
-            if (configuration.locale != null)
+            if (configuration.locale != null) {
                 throw NoResourceConfigurationOnScenarioException(
                     cause = "locale",
                     value = configuration.locale.toString(),
                     activity = activity?.javaClass?.simpleName.orEmpty()
                 )
+            }
         }
 
         return this
@@ -430,11 +432,12 @@ open class ScreenshotScenarioRule @JvmOverloads constructor(
             methodAnnotations
         )
 
-        if (annotation == null)
+        if (annotation == null) {
             this.throwable = MissingScreenshotInstrumentationAnnotationException(
                 annotationName = getScreenshotAnnotationName(),
                 methodName = methodName
             )
+        }
     }
 
     /**
@@ -447,8 +450,9 @@ open class ScreenshotScenarioRule @JvmOverloads constructor(
 
         getInstrumentation().waitForIdleSync()
 
-        if (configuration.hideSoftKeyboard)
+        if (configuration.hideSoftKeyboard) {
             closeSoftKeyboard()
+        }
     }
 
     /**
@@ -501,8 +505,8 @@ open class ScreenshotScenarioRule @JvmOverloads constructor(
         } ?: throw ScenarioRequiredException()
     }
 
-    context (scenario: ActivityScenario<*>)
     @JvmName("assertSameContext")
+    context (scenario: ActivityScenario<*>)
     fun assertSame() {
         assertSame(scenario)
     }

Plugins/Gradle/build.gradle

@@ -9,6 +9,7 @@ plugins {
     id 'jacoco'
     id 'maven-publish'
     id 'signing'
+    id 'org.jlleitschuh.gradle.ktlint' version '13.1.0'
 }
 
 def gradleProperties = new Properties()
@@ -102,7 +103,6 @@ tasks.register('javadocJar', Jar) {
 }
 
 apply from: "../../publish.build.gradle"
-apply from: '../../ktlint.gradle'
 
 jacoco {
     toolVersion = "0.8.12"
@@ -117,3 +117,17 @@ jacocoTestReport {
         html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
     }
 }
+
+ktlint {
+    version.set("1.7.1")
+    additionalEditorconfig.set([
+            "ktlint_code_style"                        : "android_studio", // Use Android Studio code style defaults
+            "ktlint_standard_class-signature"          : "disabled",       // Disable class signature wrapping enforcement
+            "ktlint_standard_function-expression-body" : "disabled",       // Function body should be replaced with body expression
+            "ktlint_standard_function-signature"       : "disabled",       // Disable function signature wrapping enforcement
+            "ktlint_standard_import-ordering"          : "disabled",       // Disable import ordering rule
+            "ktlint_standard_no-unused-imports"        : "enabled",        // Enable unused-imports rule
+            "ktlint_standard_property-naming"          : "disabled",       // Disable property naming convention checks
+            "max_line_length"                          : "200"             // Max line length before ktlint enforces wrapping
+    ])
+}

Plugins/Gradle/src/main/kotlin/dev/testify/internal/Adb.kt

@@ -71,8 +71,9 @@ class Adb {
             arguments("--user", "$forcedUser")
         } else {
             val user = Device.user
-            if (user.isNotEmpty() && (user.toIntOrNull() ?: 0) > 0)
+            if (user.isNotEmpty() && (user.toIntOrNull() ?: 0) > 0) {
                 arguments("--user", user)
+            }
         }
         return this
     }
@@ -111,7 +112,6 @@ class Adb {
     }
 
     fun testOptions(testOptionsBuilder: TestOptionsBuilder): Adb {
-
         testOptionsBuilder.resolved.forEach {
             arguments.add(TestOptionsBuilder.TEST_OPTIONS_FLAG)
             arguments.add(it)

Plugins/Gradle/src/main/kotlin/dev/testify/internal/DeviceUtilities.kt

@@ -33,16 +33,18 @@ import java.io.File
 
 internal val Project.root: String
     @Suppress("SdCardPath")
-    get() = testifySettings.rootDestinationDirectory ?: if (testifySettings.useSdCard)
+    get() = testifySettings.rootDestinationDirectory ?: if (testifySettings.useSdCard) {
         "/sdcard/Android/data/${testifySettings.targetPackageId}/files/testify_"
-    else
+    } else {
         "./app_"
+    }
 
 internal val Project.screenshotDirectory: String
-    get() = if (testifySettings.useSdCard)
+    get() = if (testifySettings.useSdCard) {
         "${root}images/"
-    else
+    } else {
         "${root}images/$SCREENSHOT_DIR"
+    }
 
 internal fun Adb.listFiles(path: String): List<String> {
     val log = this

Plugins/Gradle/src/main/kotlin/dev/testify/tasks/internal/ReportTask.kt

@@ -30,8 +30,11 @@ import org.gradle.api.tasks.Internal
 
 abstract class ReportTask : TestifyDefaultTask() {
 
-    @get:Input lateinit var reportFileName: String
-    @get:Input lateinit var reportPath: String
+    @get:Input
+    lateinit var reportFileName: String
+
+    @get:Input
+    lateinit var reportPath: String
 
     override fun getGroup() = "Testify reports"