Merge pull request #266 from ndtp/2025-08-updates

Testify 4.0.0 - Major dependency updates

Author: DanielJette

.editorconfig

@@ -1,9 +1,11 @@
 [*.{kt,kts}]
-disabled_rules=import-ordering
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
 indent_size=4
 insert_final_newline=true
 max_line_length=120
 trim_trailing_whitespace=true
 end_of_line=lf
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 4.0.0
+
+- https://github.com/ndtp/android-testify/pull/266 Updated to Kotlin 2.2
+- https://github.com/ndtp/android-testify/pull/266 Major version updates to all core dependencies. This will require the following changes to your projects:
+    - Compose 2025.08.01 updates require:
+      - kotlinCompilerExtensionVersion --> 1.9.0
+      - androidx.compose.material:material   --> 1.9.0
+      - androidx.compose.ui:ui-tooling-preview -> 1.9.0
+      - androidx.compose.ui:ui --> 1.9.0
+    - Java 21 requires you to update your app to use Java 21
+    - Compile 35+ requires you to target 35+
+    - Minimum SDK raised to 26
+
+---
+
 # Testify Change Log
 
 ## 3.2.3

Ext/Accessibility/README.md

@@ -18,7 +18,7 @@ For more information about _Accessibility Checking_, please see https://develope
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.3" apply false
+    id("dev.testify") version "4.0.0" apply false
 }
 ```
 
@@ -29,7 +29,7 @@ Ensure that `mavenCentral()` is available to both `pluginManagement` and `depend
 **Application build.gradle**
 ```groovy
 dependencies {
-    androidTestImplementation "dev.testify:testify-accessibility:3.2.3"
+    androidTestImplementation "dev.testify:testify-accessibility:4.0.0"
 }
 ```
 

Ext/Accessibility/build.gradle

@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jetbrains.dokka'
+    id 'maven-publish'
+    id 'signing'
 }
 
 ext {
@@ -92,5 +94,3 @@ android {
 afterEvaluate {
     apply from: "../../publish.build.gradle"
 }
-
-apply from: '../../ktlint.gradle'

Ext/Accessibility/src/main/java/dev/testify/accessibility/internal/CheckResults.kt

@@ -56,14 +56,18 @@ internal class CheckResults(other: List<CheckResult>) : ArrayList<CheckResult>(o
         return if (this.any { it.type == type }) "    * $type:\n${this.prettyPrint(type)}" else ""
     }
 
-    private fun List<CheckResult>.prettyPrint(filter: String): String {
-        return if (this.isEmpty())
-            "    * - [NONE]"
-        else
-            filter { it.type == filter }.joinToString(separator = "\n    * -", prefix = "    * -") {
-                "${it.check}: [${it.elementClass}/${it.resourceName}] - ${it.message}"
-            }
-    }
+    private fun List<CheckResult>.prettyPrint(filter: String) =
+        prettyPrintEmpty().takeIf { isEmpty() } ?: prettyPrintNotEmpty(filter)
+
+    private fun prettyPrintEmpty() = "    * - [NONE]"
+
+    private fun List<CheckResult>.prettyPrintNotEmpty(filter: String) = filter { it.type == filter }
+        .joinToString(
+            separator = "\n    * -",
+            prefix = "    * -"
+        ) {
+            "${it.check}: [${it.elementClass}/${it.resourceName}] - ${it.message}"
+        }
 
     companion object {
         fun fromJson(json: Reader): CheckResults {

Ext/Compose/README.md

@@ -12,7 +12,7 @@ Easily create screenshot tests for `@Composable` functions.
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.3" apply false
+    id("dev.testify") version "4.0.0" apply false
 }
 ```
 
@@ -24,7 +24,7 @@ Ensure that `mavenCentral()` is available to both `pluginManagement` and `depend
 **Application build.gradle**
 ```groovy
 dependencies {
-    androidTestImplementation "dev.testify:testify-compose:3.2.3"
+    androidTestImplementation "dev.testify:testify-compose:4.0.0"
     androidTestImplementation "androidx.test:rules:1.5.0"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.3"
 }

Ext/Compose/build.gradle

@@ -1,7 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jetbrains.dokka'
+    id 'maven-publish'
+    id 'signing'
+    alias(libs.plugins.compose.compiler)
 }
 
 ext {
@@ -66,15 +71,16 @@ android {
         compose true
     }
 
-    kotlinOptions {
-        jvmTarget = '17'
+    kotlin {
+        compilerOptions {
+            allWarningsAsErrors.set(true)
+            jvmTarget.set(JvmTarget.JVM_21)
+            freeCompilerArgs.addAll("-Xcontext-parameters")
+        }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.5.14"
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     dependencies {
@@ -106,5 +112,3 @@ android {
 afterEvaluate {
     apply from: "../../publish.build.gradle"
 }
-
-apply from: '../../ktlint.gradle'

Ext/Compose/src/main/java/dev/testify/ComposableScreenshotRule.kt

@@ -185,11 +185,12 @@ open class ComposableScreenshotRule(
      */
     override fun beforeScreenshot(activity: Activity) {
         val targetView = activity.findRootView(rootViewId).getChildAt(0)
-        if (targetView.width == 0 && targetView.height == 0)
+        if (targetView.width == 0 && targetView.height == 0) {
             throw IllegalStateException(
                 "Target view has 0 size. " +
                     "Verify if you have provided a ComposeTestRule instance to ComposableScreenshotRule."
             )
+        }
 
         super.beforeScreenshot(activity)
     }

Ext/Compose/src/main/java/dev/testify/compose/exception/ComposeContainerNotFoundException.kt

@@ -2,7 +2,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2024 ndtp
-  *
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights

Ext/Compose/src/main/java/dev/testify/compose/scenario/ComposableScreenshotScenarioRule.kt

@@ -2,7 +2,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2024 ndtp
-  *
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -206,12 +206,12 @@ open class ComposableScreenshotScenarioRule(
      */
     override fun beforeScreenshot(activity: Activity) {
         val targetView = activity.findRootView(rootViewId).getChildAt(0)
-        if (targetView.width == 0 && targetView.height == 0)
+        if (targetView.width == 0 && targetView.height == 0) {
             throw IllegalStateException(
-                "Target view has 0 size. " +
+                "Target view has 0 size." +
                     "Verify if you have provided a ComposeTestRule instance to ComposableScreenshotRule."
             )
-
+        }
         super.beforeScreenshot(activity)
     }