Skip to content

Commit

Permalink
Upgraded Showkase to newer versions of Compose + Kotlin + KSP (#384)
Browse files Browse the repository at this point in the history
* Upgraded Showkase to newer versions of Compose + Kotlin + KSP

* Leverage fork of kotlin compile testing library

* Recreate paparazzi screenshots and upload shot screenshots as an artifact

* Update shot screenshots and go back to verifying screenshots in android yaml
  • Loading branch information
vinaygaba authored May 25, 2024
1 parent c310896 commit b69d26a
Show file tree
Hide file tree
Showing 357 changed files with 311 additions and 472 deletions.
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.KSP_VERSION = '1.8.10-1.0.9'
ext.KSP_VERSION = '1.9.20-1.0.14'
ext.versions = [
'androidXTestCore' : '1.4.0',
'androidXTestRules' : '1.4.0',
'assertJ' : '3.16.1',
'compose' : '1.4.2',
'composeCompiler' : '1.4.2',
'composeActivity' : '1.5.1',
'compose' : '1.6.7',
'composeCompiler' : '1.5.5',
'composeActivity' : '1.9.0',
'composeConstraintLayout': '1.0.1',
'composeNavigation' : '2.5.1',
'detekt' : '1.7.4',
'espresso' : '3.2.0',
'gradle' : '8.0.0',
'gradle' : '8.1.1',
'junit' : '4.13.2',
'junitImplementation' : '1.1.2',
'kotlin' : '1.8.10',
'kotlinCompilerVersion' : '1.8.10',
'kotlinCompileTesting' : '1.5.0',
'kotlin' : '1.9.20',
'kotlinCompilerVersion' : '1.9.20',
'kotlinCompileTesting' : '0.4.0',
'kotlinPoet' : '1.12.0',
'kotlinXMetadata' : '0.6.0',
'ksp' : "$KSP_VERSION",
Expand All @@ -33,7 +33,7 @@ buildscript {
'mavenPublish' : '0.22.0',
'mdcComposeThemeAdapter' : '1.0.2',
'strikt' : '0.33.0',
'xprocessing' : '2.6.0-alpha01',
'xprocessing' : '2.6.1',
'corektx' : '1.7.0',
'shot' : '6.0.0'
]
Expand All @@ -54,8 +54,8 @@ buildscript {
'uiTest' : "androidx.compose.ui:ui-test-junit4:${versions.compose}",
'uiLiveData' : "androidx.compose.runtime:runtime-livedata:${versions.compose}"
],
'kotlinCompileTesting' : "com.github.tschuchortdev:kotlin-compile-testing:${versions.kotlinCompileTesting}",
'kotlinCompileTestingKsp': "com.github.tschuchortdev:kotlin-compile-testing-ksp:${versions.kotlinCompileTesting}",
'kotlinCompileTesting' : "dev.zacsweers.kctfork:core:${versions.kotlinCompileTesting}",
'kotlinCompileTestingKsp': "dev.zacsweers.kctfork:ksp:${versions.kotlinCompileTesting}",
'kotlinPoet' : "com.squareup:kotlinpoet:${versions.kotlinPoet}",
'kotlinJavaPoetInterop' : "com.squareup:kotlinpoet-javapoet:${versions.kotlinPoet}",
'kotlinXMetadata' : "org.jetbrains.kotlinx:kotlinx-metadata-jvm:${versions.kotlinXMetadata}",
Expand Down
2 changes: 1 addition & 1 deletion sample-submodule-2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {

defaultConfig {
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion sample-submodule/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {

defaultConfig {
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
defaultConfig {
applicationId "com.airbnb.android.showkasesample"
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33
versionCode 1
versionName "1.0"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"screenshots":[{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_0"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_1"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_2"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_3"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_4"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_5"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_6"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_7"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_8"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_9"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_10"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_11"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_12"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_10"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_11"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_12"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_13"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_14"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_15"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_16"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_17"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_18"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_19"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_20","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_20"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_21","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_21"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_22","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_22"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_23","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_23"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_24","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_24"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_25","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_25"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_26","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_26"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_0"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_1"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_2"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_3"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_4"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_5"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_6"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_7","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_7"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_0"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_1"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_2"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_3"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_4","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_4"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_5"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_6"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_7"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_8"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_9"}]}
Loading

0 comments on commit b69d26a

Please sign in to comment.