Skip to content

Commit dc73bfc

Browse files
committed
Use current compileSdkVersion by default for Paparazzi.
1 parent e660bab commit dc73bfc

File tree

3 files changed

+9
-4
lines changed
  • android/foundation/screenshot-testing
    • paparazzi/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/screenshottesting/paparazzi
    • tester/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/screenshottesting/tester
  • build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic

3 files changed

+9
-4
lines changed

android/foundation/screenshot-testing/paparazzi/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/screenshottesting/paparazzi/PaparazziBridge.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public abstract class PaparazziBridge(
2020
private val deviceConfig: DeviceConfig,
2121
private val theme: String,
2222
private val renderingMode: SessionParams.RenderingMode,
23-
private val compileSdkVersion: Int,
23+
private val compileSdkVersion: Int? = null,
2424
maxPercentDifference: Double,
2525
) {
2626
private lateinit var sdk: PaparazziSdk
@@ -33,7 +33,13 @@ public abstract class PaparazziBridge(
3333
content: @Composable () -> Unit,
3434
) {
3535
sdk = PaparazziSdk(
36-
environment = detectEnvironment().copy(compileSdkVersion = compileSdkVersion),
36+
environment = detectEnvironment().let {
37+
if (compileSdkVersion != null) {
38+
it.copy(compileSdkVersion = compileSdkVersion)
39+
} else {
40+
it
41+
}
42+
},
3743
deviceConfig = deviceConfig,
3844
theme = theme,
3945
renderingMode = renderingMode,

android/foundation/screenshot-testing/tester/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/screenshottesting/tester/SnapshotTester.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class SnapshotTester(
1919
deviceConfig = PIXEL_6,
2020
theme = "android:Theme.Material.Light.NoActionBar",
2121
renderingMode = SessionParams.RenderingMode.SHRINK,
22-
compileSdkVersion = 34,
22+
compileSdkVersion = 34, // TODO remove once paparazzi / layoutlib supports compileSdkVersion 35 / 36
2323
maxPercentDifference = maxPercentDifference,
2424
) {
2525
private lateinit var description: Description

build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/kotlinBuildLogic.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1111
/**
1212
* Configure Kotlin compiler options, language settings, JVM toolchain for all projects.
1313
*/
14-
@Suppress("MagicNumber")
1514
internal fun KotlinProjectExtension.configureKotlin(
1615
target: Project,
1716
enableExplicitApi: Boolean = true,

0 commit comments

Comments
 (0)