Cleanup from upstream changes

cashapp · Nov 20, 2024 · 4a56e55 · 4a56e55
1 parent 0d74bae
commit 4a56e55
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 42 deletions.
diff --git a/paparazzi-annotations/api/paparazzi-annotations.api b/paparazzi-annotations/api/paparazzi-annotations.api
@@ -18,25 +18,3 @@ public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Default :
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Empty : app/cash/paparazzi/annotations/PaparazziPreviewData {
-	public static final field $stable I
-	public static final field INSTANCE Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Empty;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Error : app/cash/paparazzi/annotations/PaparazziPreviewData {
-	public static final field $stable I
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;
-	public static synthetic fun copy$default (Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMessage ()Ljava/lang/String;
-	public final fun getSnapshotName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
diff --git a/paparazzi-annotations/src/main/java/app/cash/paparazzi/annotations/PaparazziPreviewData.kt b/paparazzi-annotations/src/main/java/app/cash/paparazzi/annotations/PaparazziPreviewData.kt
@@ -6,8 +6,6 @@ import androidx.compose.runtime.Composable
  * Represents composables annotated with @Paparazzi annotation
  *
  * Default - Represents a composable with no parameters
- * Empty - Represents a configuration with zero annotated composables
- * Error - Represents an error state with a message if the composable is misconfgured (ex. private Composable function)
  */
 public sealed interface PaparazziPreviewData {
 
@@ -17,15 +15,4 @@ public sealed interface PaparazziPreviewData {
   ) : PaparazziPreviewData {
     override fun toString(): String = snapshotName
   }
-
-  public data object Empty : PaparazziPreviewData {
-    override fun toString(): String = "Empty"
-  }
-
-  public data class Error(
-    val snapshotName: String,
-    val message: String
-  ) : PaparazziPreviewData {
-    override fun toString(): String = snapshotName
-  }
 }
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-preview-test-junit/api/paparazzi-preview-test-junit.api b/paparazzi-preview-test-junit/api/paparazzi-preview-test-junit.api
@@ -1,7 +1,7 @@
-public class app/cash/paparazzi/preview/PaparazziValuesProvider : com/google/testing/junit/testparameterinjector/TestParameter$TestParameterValuesProvider {
+public class app/cash/paparazzi/preview/PaparazziValuesProvider : com/google/testing/junit/testparameterinjector/TestParameterValuesProvider {
 	public static final field $stable I
 	public fun <init> (Ljava/util/List;)V
-	public fun provideValues ()Ljava/util/List;
+	protected fun provideValues (Lcom/google/testing/junit/testparameterinjector/TestParameterValuesProvider$Context;)Ljava/util/List;
 }
 
 public final class app/cash/paparazzi/preview/SnapshotKt {

diff --git a/paparazzi-preview-test-junit/src/main/java/app/cash/paparazzi/preview/Snapshot.kt b/paparazzi-preview-test-junit/src/main/java/app/cash/paparazzi/preview/Snapshot.kt
@@ -3,16 +3,14 @@ package app.cash.paparazzi.preview
 
 import app.cash.paparazzi.Paparazzi
 import app.cash.paparazzi.annotations.PaparazziPreviewData
-import com.google.testing.junit.testparameterinjector.TestParameter.TestParameterValuesProvider
+import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
 
 /**
  * Take a snapshot of the given [previewData].
  */
 public fun Paparazzi.snapshot(previewData: PaparazziPreviewData, name: String? = null) {
   when (previewData) {
     is PaparazziPreviewData.Default -> snapshotDefault(previewData, name)
-    is PaparazziPreviewData.Empty -> Unit
-    is PaparazziPreviewData.Error -> error(previewData.message)
   }
 }
 
@@ -26,6 +24,6 @@ public fun Paparazzi.snapshot(previewData: PaparazziPreviewData, name: String? =
  */
 public open class PaparazziValuesProvider(
   private val annotations: List<PaparazziPreviewData>
-) : TestParameterValuesProvider {
-  override fun provideValues(): List<PaparazziPreviewData> = annotations
+) : TestParameterValuesProvider() {
+  override fun provideValues(context: Context?): MutableList<*> = annotations.toMutableList()
 }