Merge pull request #602 from usefulness/renovate/io.github.usefulness…

…-screenshot-testing-core-1.x Update dependency io.github.usefulness:screenshot-testing-core to v1
usefulness · May 19, 2024 · 4f5a17a · 4f5a17a
2 parents 8fe35fa + fe9d249
commit 4f5a17a
Show file tree

Hide file tree

Showing 37 changed files with 55 additions and 81 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -184,16 +184,6 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@v3
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: '.python-version'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install 'Pillow==9.1.1'
-
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

diff --git a/.python-version b/.python-version
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -16,7 +16,7 @@ buildscript {
     }
     dependencies {
         classpath "com.project.starter:android:0.73.0"
-        classpath "io.github.usefulness:screenshot-testing-plugin:0.17.5"
+        classpath "io.github.usefulness:screenshot-testing-plugin:1.0.2"
         if (project.hasProperty("useMavenLocal")) {
             classpath "com.project.starter.local:easylauncher:+"
         } else {
@@ -91,6 +91,7 @@ subprojects {
             }
         }
 
+        String lastTask = null
         android.applicationVariants.configureEach { variant ->
             def recordTask = tasks.findByName("record${variant.name.capitalize()}AndroidTestScreenshotTest")
 
@@ -105,6 +106,17 @@ subprojects {
 
                 tasks.recordAll.dependsOn recordAndCopyTask
             }
+
+            if (lastTask != null) {
+                if (gradle.gradleVersion.startsWith("8.0")) {
+                    return
+                }
+                tasks.named { it == "record${variant.name.capitalize()}AndroidTestScreenshotTest" }.configureEach {
+                    mustRunAfter("record${lastTask.capitalize()}AndroidTestScreenshotTest")
+                    mustRunAfter("recordAndCopy${lastTask.capitalize()}AndroidTestScreenshotTest")
+                }
+            }
+            lastTask = variant.name
         }
 
         tasks.register("verifyAll") {
@@ -125,92 +137,55 @@ subprojects {
             useJUnitPlatform()
         }
 
-        screenshots {
-            addDeps = false
-            failureDir = layout.buildDirectory.dir("failedScreenshots").get().asFile.path
-        }
-
         dependencies {
             androidTestImplementation project(":screenshot-test-helpers")
         }
     }
 
     pluginManager.withPlugin("com.android.library") {
-        pluginManager.apply("io.github.usefulness.screenshot-testing-plugin")
-
-        android {
-            testOptions.unitTests.includeAndroidResources true
+        pluginManager.withPlugin("io.github.usefulness.screenshot-testing-plugin") {
+            tasks.register("recordAll", Copy) {
+                group = 'screenshot test'
 
-            packagingOptions {
-                exclude "META-INF/LICENSE*"
-            }
+                def tempDir = layout.buildDirectory.map { it.dir("screenshots_tmp") }
+                from tempDir
+                into "screenshots/"
 
-            testVariants.configureEach { variant ->
-                variant.mergedFlavor.applicationIdSuffix = variant.name
-                if (variant.flavorName == "") {
-                    variant.mergedFlavor.manifestPlaceholders += [appName: "$project.name"]
-                } else {
-                    variant.mergedFlavor.manifestPlaceholders += [appName: "$variant.flavorName"]
+                doLast {
+                    tempDir.get().asFile.deleteDir()
                 }
             }
 
-            lintOptions {
-                disable("VectorPath", "HardcodedText", "IconDuplicates", "ContentDescription")
+            android.libraryVariants.configureEach { variant ->
+                def recordTask = tasks.findByName("record${variant.name.capitalize()}AndroidTestScreenshotTest")
 
-                if (agpVersion == "" || agpVersion.startsWith("8")) {
-                    disable("MonochromeLauncherIcon")
-                }
+                if (recordTask != null) {
+                    def recordAndCopyTask = "recordAndCopy${variant.name.capitalize()}AndroidTestScreenshotTest"
 
-                warningsAsErrors = true
-            }
-        }
+                    tasks.register(recordAndCopyTask, Copy) {
+                        from "screenshots/"
+                        into layout.buildDirectory.dir("screenshots_tmp")
+                        dependsOn recordTask
+                    }
 
-        tasks.register("recordAll", Copy) {
-            group = 'screenshot test'
-
-            def tempDir = layout.buildDirectory.map { it.dir("screenshots_tmp") }
-            from tempDir
-            into "screenshots/"
-
-            doLast {
-                tempDir.get().asFile.deleteDir()
+                    tasks.recordAll.dependsOn recordAndCopyTask
+                }
             }
-        }
-
-        android.libraryVariants.configureEach { variant ->
-            def recordTask = tasks.findByName("record${variant.name.capitalize()}AndroidTestScreenshotTest")
 
-            if (recordTask != null) {
-                def recordAndCopyTask = "recordAndCopy${variant.name.capitalize()}AndroidTestScreenshotTest"
-
-                tasks.register(recordAndCopyTask, Copy) {
-                    from "screenshots/"
-                    into layout.buildDirectory.dir("screenshots_tmp")
-                    dependsOn recordTask
+            tasks.register("verifyAll") {
+                group = 'screenshot test'
+                android.libraryVariants.configureEach { variant ->
+                    dependsOn("verify${variant.flavorName.capitalize()}DebugAndroidTestScreenshotTest")
                 }
-
-                tasks.recordAll.dependsOn recordAndCopyTask
             }
-        }
 
-        tasks.register("verifyAll") {
-            group = 'screenshot test'
-            android.libraryVariants.configureEach { variant ->
-                dependsOn("verify${variant.flavorName.capitalize()}DebugAndroidTestScreenshotTest")
+            tasks.withType(Test).configureEach {
+                useJUnitPlatform()
             }
-        }
 
-        tasks.withType(Test).configureEach {
-            useJUnitPlatform()
-        }
-
-        screenshots {
-            addDeps = false
-            failureDir = layout.buildDirectory.map { it.dir("failedScreenshots") }.get().asFile
-        }
-
-        dependencies {
-            androidTestImplementation project(":screenshot-test-helpers")
+            dependencies {
+                androidTestImplementation project(":screenshot-test-helpers")
+            }
         }
     }
 

diff --git a/sample/example-activity-alias/screenshots/Icons_doScreenshot(debug).png b/sample/example-activity-alias/screenshots/Icons_doScreenshot(debug).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(localAaa).png b/sample/example-custom/screenshots/Icons_doScreenshot(localAaa).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(localBbb).png b/sample/example-custom/screenshots/Icons_doScreenshot(localBbb).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(productionAaa).png b/sample/example-custom/screenshots/Icons_doScreenshot(productionAaa).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(productionBbb).png b/sample/example-custom/screenshots/Icons_doScreenshot(productionBbb).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(qaAaa).png b/sample/example-custom/screenshots/Icons_doScreenshot(qaAaa).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(qaBbb).png b/sample/example-custom/screenshots/Icons_doScreenshot(qaBbb).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(stagingAaa).png b/sample/example-custom/screenshots/Icons_doScreenshot(stagingAaa).png
diff --git a/sample/example-custom/screenshots/Icons_doScreenshot(stagingBbb).png b/sample/example-custom/screenshots/Icons_doScreenshot(stagingBbb).png
diff --git a/sample/example-icon-round/screenshots/Icons_default(ignore-default).png b/sample/example-icon-round/screenshots/Icons_default(ignore-default).png
diff --git a/sample/example-icon-round/screenshots/Icons_default(keep-default).png b/sample/example-icon-round/screenshots/Icons_default(keep-default).png
diff --git a/sample/example-icon-round/screenshots/Icons_round(ignore-round).png b/sample/example-icon-round/screenshots/Icons_round(ignore-round).png
diff --git a/sample/example-icon-round/screenshots/Icons_round(keep-round).png b/sample/example-icon-round/screenshots/Icons_round(keep-round).png
diff --git a/sample/example-library/build.gradle b/sample/example-library/build.gradle
@@ -1,14 +1,24 @@
 apply plugin: 'com.starter.library.android'
 apply plugin: 'com.starter.easylauncher'
+pluginManager.apply("io.github.usefulness.screenshot-testing-plugin")
 
 android {
     namespace "com.example.simple"
+
     defaultConfig {
         minSdk = 26
     }
+
+    packagingOptions {
+        exclude "META-INF/LICENSE*"
+    }
+
+    testOptions.unitTests.includeAndroidResources true
+
     testVariants.configureEach { variant ->
         variant.mergedFlavor.manifestPlaceholders = [appName: ""]
     }
+
     unitTestVariants.configureEach { variant ->
         variant.mergedFlavor.manifestPlaceholders = [appName: ""]
     }

diff --git a/sample/example-library/screenshots/Icons_doScreenshot(library).png b/sample/example-library/screenshots/Icons_doScreenshot(library).png
diff --git a/sample/example-manifest-placeholder/screenshots/Icons_doScreenshot(debug).png b/sample/example-manifest-placeholder/screenshots/Icons_doScreenshot(debug).png
diff --git a/sample/example-scripted/screenshots/Icons_doScreenshot(default).png b/sample/example-scripted/screenshots/Icons_doScreenshot(default).png
diff --git a/sample/example-simple/screenshots/Icons_doScreenshot(debug).png b/sample/example-simple/screenshots/Icons_doScreenshot(debug).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(allFilters).png b/sample/example-vector/screenshots/Icons_doScreenshot(allFilters).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(alpha).png b/sample/example-vector/screenshots/Icons_doScreenshot(alpha).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(chromeLike).png b/sample/example-vector/screenshots/Icons_doScreenshot(chromeLike).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(chromeLikeCustomized).png b/sample/example-vector/screenshots/Icons_doScreenshot(chromeLikeCustomized).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(chromeLikeTop).png b/sample/example-vector/screenshots/Icons_doScreenshot(chromeLikeTop).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(customDrawable).png b/sample/example-vector/screenshots/Icons_doScreenshot(customDrawable).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(customFont).png b/sample/example-vector/screenshots/Icons_doScreenshot(customFont).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(customFontByFile).png b/sample/example-vector/screenshots/Icons_doScreenshot(customFontByFile).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(customFontByOtf).png b/sample/example-vector/screenshots/Icons_doScreenshot(customFontByOtf).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(twoVectors).png b/sample/example-vector/screenshots/Icons_doScreenshot(twoVectors).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(usingAndroidVersion).png b/sample/example-vector/screenshots/Icons_doScreenshot(usingAndroidVersion).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(usingResValues).png b/sample/example-vector/screenshots/Icons_doScreenshot(usingResValues).png
diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(wrongLabelPosition).png b/sample/example-vector/screenshots/Icons_doScreenshot(wrongLabelPosition).png
diff --git a/sample/example-webp/screenshots/Icons_doScreenshot(debug).png b/sample/example-webp/screenshots/Icons_doScreenshot(debug).png
diff --git a/sample/screenshot-test-helpers/build.gradle b/sample/screenshot-test-helpers/build.gradle
@@ -11,7 +11,7 @@ android {
 
 dependencies {
     implementation(project(":adaptive-support"))
-    api("io.github.usefulness:screenshot-testing-core:0.17.5")
+    api("io.github.usefulness:screenshot-testing-core:1.0.2")
     api(platform("org.junit:junit-bom:5.10.2"))
     api("org.junit.vintage:junit-vintage-engine:5.10.2")
     api("androidx.test:rules:1.5.0")

diff --git a/...e/screenshot-test-helpers/src/main/kotlin/com/starter/easylauncher/ScreenshotTestUtils.kt b/...e/screenshot-test-helpers/src/main/kotlin/com/starter/easylauncher/ScreenshotTestUtils.kt
@@ -6,9 +6,9 @@ import android.view.View
 import androidx.annotation.DrawableRes
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
-import com.facebook.testing.screenshot.Screenshot
-import com.facebook.testing.screenshot.TestNameDetector
-import com.facebook.testing.screenshot.ViewHelpers
+import io.github.usefulness.testing.screenshot.Screenshot
+import io.github.usefulness.testing.screenshot.TestNameDetector
+import io.github.usefulness.testing.screenshot.ViewHelpers
 import kotlin.reflect.KClass
 import com.example.custom.adaptive.R as AdaptiveR