From 5599d6d70d13b0a9e3e3e5055a92f0e1465009a8 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 28 Mar 2025 15:15:53 +0530 Subject: [PATCH] refactor: drop screenshot tests This breaks the Anvil Gradle Plugin See: https://github.com/ZacSweers/anvil/issues/89 --- .gitattributes | 1 - android/build.gradle.kts | 4 -- ...Preview_Dark theme_6497bd62_da39a3ee_0.png | 3 -- ...review_Light theme_5e9d521d_da39a3ee_0.png | 3 -- .../claw/android/ui/lists/NetworkPostsTest.kt | 37 ------------------- .../claw/gradle/DependencyUpdatesPlugin.kt | 1 - common/build.gradle.kts | 4 -- .../DefaultPreview_3d8b4969_da39a3ee_0.png | 3 -- .../common/ui/decorations/MonthHeaderTest.kt | 21 ----------- gradle/libs.versions.toml | 1 - 10 files changed, 78 deletions(-) delete mode 100644 android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Dark theme_6497bd62_da39a3ee_0.png delete mode 100644 android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Light theme_5e9d521d_da39a3ee_0.png delete mode 100644 android/src/screenshotTest/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest.kt delete mode 100644 common/src/debug/screenshotTest/reference/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest/DefaultPreview_3d8b4969_da39a3ee_0.png delete mode 100644 common/src/screenshotTest/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest.kt diff --git a/.gitattributes b/.gitattributes index 5c06d2c2..8e661440 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,3 @@ **/*.html linguist-vendored android/src/main/baseline-prof.txt linguist-generated -diff android/src/main/generated/** linguist-generated -diff -**/screenshotTest/**/*.png filter=lfs diff=lfs merge=lfs -text diff --git a/android/build.gradle.kts b/android/build.gradle.kts index ffdb907f..267d9ae7 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -29,7 +29,6 @@ plugins { alias(libs.plugins.kotlin.composeCompiler) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.navigation.safeargs) - alias(libs.plugins.screenshot) alias(libs.plugins.dependencyAnalysis) } @@ -45,7 +44,6 @@ extensions.configure { applicationIdSuffix = ".internal" isDebuggable = true } - experimentalProperties["android.experimental.enableScreenshotTest"] = true } aboutLibraries.gitHubApiToken = providers.environmentVariable("GITHUB_TOKEN").orNull @@ -139,8 +137,6 @@ dependencies { kapt(libs.dagger.compiler) - screenshotTestImplementation(libs.androidx.compose.ui.tooling) - addTestDependencies(project) androidTestImplementation(libs.androidx.test.espresso.core) androidTestImplementation(libs.androidx.test.uiautomator) diff --git a/android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Dark theme_6497bd62_da39a3ee_0.png b/android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Dark theme_6497bd62_da39a3ee_0.png deleted file mode 100644 index 833dd732..00000000 --- a/android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Dark theme_6497bd62_da39a3ee_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10defb7f6abec5d8bd07e07625e30e5b68d3a330e87f157e8138688f8d7ef0aa -size 214795 diff --git a/android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Light theme_5e9d521d_da39a3ee_0.png b/android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Light theme_5e9d521d_da39a3ee_0.png deleted file mode 100644 index c1b97b2e..00000000 --- a/android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Light theme_5e9d521d_da39a3ee_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64dd5c002c021774469d7d9a15433678a014f720b6cde2281fbbf20daee98712 -size 216093 diff --git a/android/src/screenshotTest/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest.kt b/android/src/screenshotTest/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest.kt deleted file mode 100644 index 55aa1fd3..00000000 --- a/android/src/screenshotTest/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright © Harsh Shandilya. - * Use of this source code is governed by an MIT-style - * license that can be found in the LICENSE file or at - * https://opensource.org/licenses/MIT. - */ -package dev.msfjarvis.claw.android.ui.lists - -import android.annotation.SuppressLint -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.runtime.Composable -import androidx.paging.PagingData -import androidx.paging.compose.collectAsLazyPagingItems -import dev.msfjarvis.claw.common.posts.TEST_POST -import dev.msfjarvis.claw.common.posts.TEST_POST_ACTIONS -import dev.msfjarvis.claw.common.theme.LobstersTheme -import dev.msfjarvis.claw.common.ui.preview.ThemePreviews -import kotlinx.coroutines.flow.MutableStateFlow - -@SuppressLint("ComposePreviewPublic", "ComposeUnstableReceiver") -class NetworkPostsTest { - @ThemePreviews - @Composable - fun DefaultPreview() { - val items = List(20) { TEST_POST.copy(shortId = "${TEST_POST.shortId}${it}") } - val flow = MutableStateFlow(PagingData.from(items)) - LobstersTheme { - NetworkPosts( - lazyPagingItems = flow.collectAsLazyPagingItems(), - listState = rememberLazyListState(), - postActions = TEST_POST_ACTIONS, - contentPadding = PaddingValues(), - ) - } - } -} diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt index 81d595e4..89f3405b 100644 --- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt +++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt @@ -21,7 +21,6 @@ class DependencyUpdatesPlugin : Plugin { override fun apply(project: Project) { project.pluginManager.apply(VersionCatalogUpdatePlugin::class) project.extensions.configure { - keep.keepUnusedLibraries.set(true) versionSelector { val currentVersion = Version.tryParse(it.currentVersion).getOrNull() val newVersion = Version.tryParse(it.candidate.version).getOrNull() diff --git a/common/build.gradle.kts b/common/build.gradle.kts index e3bc1277..24241a4b 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -16,7 +16,6 @@ plugins { alias(libs.plugins.anvil) alias(libs.plugins.whetstone) alias(libs.plugins.kotlin.composeCompiler) - alias(libs.plugins.screenshot) alias(libs.plugins.dependencyAnalysis) } @@ -26,7 +25,6 @@ android { compose = true } namespace = "dev.msfjarvis.claw.common" - experimentalProperties["android.experimental.enableScreenshotTest"] = true } androidComponents { beforeVariants { (it as HasUnitTestBuilder).enableUnitTest = false } } @@ -69,8 +67,6 @@ dependencies { implementation(libs.kotlinResult.coroutines) implementation(libs.napier) - screenshotTestImplementation(libs.androidx.compose.ui.tooling) - compileOnly(libs.androidx.compose.ui.tooling.preview) runtimeOnly(libs.androidx.compose.ui.tooling) diff --git a/common/src/debug/screenshotTest/reference/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest/DefaultPreview_3d8b4969_da39a3ee_0.png b/common/src/debug/screenshotTest/reference/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest/DefaultPreview_3d8b4969_da39a3ee_0.png deleted file mode 100644 index f130a204..00000000 --- a/common/src/debug/screenshotTest/reference/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest/DefaultPreview_3d8b4969_da39a3ee_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d9d4a162b7ba995f625b4feb683879de46ad1c583a37c5cc721030521cece11 -size 6633 diff --git a/common/src/screenshotTest/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest.kt b/common/src/screenshotTest/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest.kt deleted file mode 100644 index 8a067a88..00000000 --- a/common/src/screenshotTest/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeaderTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright © Harsh Shandilya. - * Use of this source code is governed by an MIT-style - * license that can be found in the LICENSE file or at - * https://opensource.org/licenses/MIT. - */ -package dev.msfjarvis.claw.common.ui.decorations - -import android.annotation.SuppressLint -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import dev.msfjarvis.claw.common.theme.LobstersTheme - -@SuppressLint("ComposePreviewPublic", "ComposeUnstableReceiver") -class MonthHeaderTest { - @Preview(showBackground = true) - @Composable - fun DefaultPreview() { - LobstersTheme { MonthHeader(label = "April 2023") } - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 547bff7a..f3f0b6ce 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -138,7 +138,6 @@ licensee = "app.cash.licensee:1.13.0" modulegraphassert = "com.jraska.module.graph.assertion:2.8.0" navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } poko = "dev.drewhamilton.poko:0.18.4" -screenshot = "com.android.compose.screenshot:0.0.1-alpha09" sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } tracelog = "dev.msfjarvis.tracelog:0.1.3" whetstone = { id = "dev.msfjarvis.whetstone", version.ref = "whetstone" }