Skip to content

Commit bb7ba9e

Browse files
committed
Cleanup from upstream changes
1 parent 861172f commit bb7ba9e

File tree

5 files changed

+5
-42
lines changed

5 files changed

+5
-42
lines changed

paparazzi-annotations/api/paparazzi-annotations.api

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,3 @@ public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Default :
1818
public fun toString ()Ljava/lang/String;
1919
}
2020

21-
public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Empty : app/cash/paparazzi/annotations/PaparazziPreviewData {
22-
public static final field $stable I
23-
public static final field INSTANCE Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Empty;
24-
public fun equals (Ljava/lang/Object;)Z
25-
public fun hashCode ()I
26-
public fun toString ()Ljava/lang/String;
27-
}
28-
29-
public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Error : app/cash/paparazzi/annotations/PaparazziPreviewData {
30-
public static final field $stable I
31-
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
32-
public final fun component1 ()Ljava/lang/String;
33-
public final fun component2 ()Ljava/lang/String;
34-
public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;
35-
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;
36-
public fun equals (Ljava/lang/Object;)Z
37-
public final fun getMessage ()Ljava/lang/String;
38-
public final fun getSnapshotName ()Ljava/lang/String;
39-
public fun hashCode ()I
40-
public fun toString ()Ljava/lang/String;
41-
}
42-

paparazzi-annotations/src/main/java/app/cash/paparazzi/annotations/PaparazziPreviewData.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import androidx.compose.runtime.Composable
66
* Represents composables annotated with @Paparazzi annotation
77
*
88
* Default - Represents a composable with no parameters
9-
* Empty - Represents a configuration with zero annotated composables
10-
* Error - Represents an error state with a message if the composable is misconfgured (ex. private Composable function)
119
*/
1210
public sealed interface PaparazziPreviewData {
1311

@@ -17,15 +15,4 @@ public sealed interface PaparazziPreviewData {
1715
) : PaparazziPreviewData {
1816
override fun toString(): String = snapshotName
1917
}
20-
21-
public data object Empty : PaparazziPreviewData {
22-
override fun toString(): String = "Empty"
23-
}
24-
25-
public data class Error(
26-
val snapshotName: String,
27-
val message: String
28-
) : PaparazziPreviewData {
29-
override fun toString(): String = snapshotName
30-
}
3118
}

paparazzi-preview-processor/src/main/java/app/cash/paparazzi/preview/processor/Utils.kt

Whitespace-only changes.

paparazzi-preview-test-junit/api/paparazzi-preview-test-junit.api

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
public class app/cash/paparazzi/preview/PaparazziValuesProvider : com/google/testing/junit/testparameterinjector/TestParameter$TestParameterValuesProvider {
1+
public class app/cash/paparazzi/preview/PaparazziValuesProvider : com/google/testing/junit/testparameterinjector/TestParameterValuesProvider {
22
public static final field $stable I
33
public fun <init> (Ljava/util/List;)V
4-
public fun provideValues ()Ljava/util/List;
4+
protected fun provideValues (Lcom/google/testing/junit/testparameterinjector/TestParameterValuesProvider$Context;)Ljava/util/List;
55
}
66

77
public final class app/cash/paparazzi/preview/SnapshotKt {

paparazzi-preview-test-junit/src/main/java/app/cash/paparazzi/preview/Snapshot.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ package app.cash.paparazzi.preview
33

44
import app.cash.paparazzi.Paparazzi
55
import app.cash.paparazzi.annotations.PaparazziPreviewData
6-
import com.google.testing.junit.testparameterinjector.TestParameter.TestParameterValuesProvider
6+
import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
77

88
/**
99
* Take a snapshot of the given [previewData].
1010
*/
1111
public fun Paparazzi.snapshot(previewData: PaparazziPreviewData, name: String? = null) {
1212
when (previewData) {
1313
is PaparazziPreviewData.Default -> snapshotDefault(previewData, name)
14-
is PaparazziPreviewData.Empty -> Unit
15-
is PaparazziPreviewData.Error -> error(previewData.message)
1614
}
1715
}
1816

@@ -26,6 +24,6 @@ public fun Paparazzi.snapshot(previewData: PaparazziPreviewData, name: String? =
2624
*/
2725
public open class PaparazziValuesProvider(
2826
private val annotations: List<PaparazziPreviewData>
29-
) : TestParameterValuesProvider {
30-
override fun provideValues(): List<PaparazziPreviewData> = annotations
27+
) : TestParameterValuesProvider() {
28+
override fun provideValues(context: Context?): MutableList<*> = annotations.toMutableList()
3129
}

0 commit comments

Comments
 (0)