Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Showkase to latest version of Jetpack Compose Navigation #370

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ buildscript {
'androidXTestCore' : '1.4.0',
'androidXTestRules' : '1.4.0',
'assertJ' : '3.16.1',
'compose' : '1.4.2',
'compose' : '1.5.1',
'composeCompiler' : '1.4.2',
'composeActivity' : '1.5.1',
'composeActivity' : '1.7.2',
'composeConstraintLayout': '1.0.1',
'composeNavigation' : '2.5.1',
'composeNavigation' : '2.7.6',
'detekt' : '1.7.4',
'espresso' : '3.2.0',
'gradle' : '8.0.0',
'gradle' : '8.1.4',
'junit' : '4.13.2',
'junitImplementation' : '1.1.2',
'kotlin' : '1.8.10',
Expand All @@ -22,10 +22,10 @@ buildscript {
'kotlinXMetadata' : '0.6.0',
'ksp' : "$KSP_VERSION",
'ktx' : '1.1.0',
'lifecycle' : '2.2.0',
'lifecycle' : '2.6.2',
'paparazzi' : '1.2.0',
'picasso' : '2.8',
'appcompat' : '1.4.0',
'appcompat' : '1.6.1',
'testRunner' : '1.4.0',
'testParameterInjector' : '1.8',
'googleTruth' : '1.1.3',
Expand Down Expand Up @@ -66,7 +66,8 @@ buildscript {
'support' : [
'appCompat' : "androidx.appcompat:appcompat:${versions.appcompat}",
'ktx' : "androidx.core:core-ktx:${versions.corektx}",
'lifecycleExtensions': "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}"
'lifecycleComposeVm' : "androidx.lifecycle:lifecycle-viewmodel-compose:${versions.lifecycle}",
'lifecycleComposeRn' : "androidx.lifecycle:lifecycle-runtime-compose:${versions.lifecycle}",
],
'test' : [
'androidXTestCore' : "androidx.test:core:${versions.androidXTestCore}",
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Sep 19 07:58:34 PDT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 3 additions & 2 deletions 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 Expand Up @@ -61,7 +61,8 @@ dependencies {
// Support Libraries
implementation deps.support.appCompat
implementation deps.support.ktx
implementation deps.support.lifecycleExtensions
implementation deps.support.lifecycleComposeVm
implementation deps.support.lifecycleComposeRn

// Showkase
implementation project(':showkase')
Expand Down
7 changes: 4 additions & 3 deletions 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 Expand Up @@ -62,8 +62,9 @@ dependencies {
// Support Libraries
implementation deps.support.appCompat
implementation deps.support.ktx
implementation deps.support.lifecycleExtensions

implementation deps.support.lifecycleComposeVm
implementation deps.support.lifecycleComposeRn

// Showkase
implementation project(':showkase')
if (project.hasProperty('useKsp')) {
Expand Down
5 changes: 3 additions & 2 deletions 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 Expand Up @@ -94,7 +94,8 @@ dependencies {
// Support Libraries
implementation deps.support.appCompat
implementation deps.support.ktx
implementation deps.support.lifecycleExtensions
implementation deps.support.lifecycleComposeVm
implementation deps.support.lifecycleComposeRn

// Compose
implementation deps.compose.activityCompose
Expand Down
2 changes: 1 addition & 1 deletion showkase-browser-testing-submodule-2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
}
defaultConfig {
minSdkVersion 26
compileSdk 33
compileSdk 34
targetSdkVersion 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
Expand Down
2 changes: 1 addition & 1 deletion showkase-browser-testing-submodule/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
}
defaultConfig {
minSdkVersion 26
compileSdk 33
compileSdk 34
targetSdkVersion 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
Expand Down
2 changes: 1 addition & 1 deletion showkase-browser-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {

defaultConfig {
minSdkVersion 26
compileSdk 33
compileSdk 34
targetSdkVersion 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
Expand Down
2 changes: 1 addition & 1 deletion showkase-processor-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {
}
defaultConfig {
minSdkVersion 26
compileSdk 33
compileSdk 34
targetSdkVersion 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
Expand Down
2 changes: 1 addition & 1 deletion showkase-screenshot-testing-paparazzi-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
}
defaultConfig {
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33
// The following argument makes the Android Test Orchestrator run its
// "pm clear" command after each test invocation. This command ensures
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions showkase-screenshot-testing-paparazzi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ configurations {

android {
namespace 'com.airbnb.android.showkase.screenshot.testing.paparazzi'
compileSdk 33
compileSdk 34

defaultConfig {
minSdk 21
Expand Down Expand Up @@ -89,4 +89,4 @@ dependencies {
api deps.test.testParameterInjector
api deps.test.androidXTestRules
api deps.test.androidxTestRunner
}
}
2 changes: 1 addition & 1 deletion showkase-screenshot-testing-shot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
defaultConfig {
testApplicationId "com.airbnb.android.showkase.screenshot.testing.shot"
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33
testInstrumentationRunner "com.karumi.shot.ShotTestRunner"
// The following argument makes the Android Test Orchestrator run its
Expand Down
2 changes: 1 addition & 1 deletion showkase-screenshot-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ android {
}
defaultConfig {
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
Expand Down
2 changes: 1 addition & 1 deletion showkase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {

defaultConfig {
minSdkVersion 21
compileSdk 33
compileSdk 34
targetSdkVersion 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down