Skip to content

Commit 88435f2

Browse files
authored
Merge pull request #7353 from vector-im/feature/bma/paparazzi_version
Ensure the latest paparazzi version is used, when updated by Dependabot.
2 parents 7cc06fa + ac332a8 commit 88435f2

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ buildscript {
3333
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
3434
classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
3535
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
36-
classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0'
36+
classpath libs.squareup.paparazziPlugin
3737
// NOTE: Do not place your application dependencies here; they belong
3838
// in the individual module build.gradle files
3939
}
@@ -322,7 +322,7 @@ ext.initScreenshotTests = { project ->
322322
if (hasScreenshots) {
323323
project.apply plugin: 'app.cash.paparazzi'
324324
}
325-
project.dependencies { testCompileOnly "app.cash.paparazzi:paparazzi:1.0.0" }
325+
project.dependencies { testCompileOnly libs.squareup.paparazzi }
326326
project.android.testOptions.unitTests.all {
327327
def screenshotTestCapture = "**/*ScreenshotTest*"
328328
if (hasScreenshots) {

dependencies.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
ext.versions = [
2-
32
'minSdk' : 21,
43
'compileSdk' : 33,
54
'targetSdk' : 33,
@@ -27,22 +26,20 @@ def jjwt = "0.11.5"
2726
// Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
2827
// the whole commit which set version 0.16.0-SNAPSHOT
2928
def vanniktechEmoji = "0.16.0-SNAPSHOT"
30-
3129
def sentry = "6.6.0"
32-
3330
def fragment = "1.5.4"
34-
3531
// Testing
3632
def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
3733
def espresso = "3.4.0"
3834
def androidxTest = "1.4.0"
3935
def androidxOrchestrator = "1.4.1"
36+
def paparazzi = "1.1.0"
37+
4038
ext.libs = [
4139
gradle : [
4240
'gradlePlugin' : "com.android.tools.build:gradle:$gradle",
4341
'kotlinPlugin' : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin",
4442
'hiltPlugin' : "com.google.dagger:hilt-android-gradle-plugin:$dagger"
45-
4643
],
4744
jetbrains : [
4845
'coroutinesCore' : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
@@ -108,6 +105,8 @@ ext.libs = [
108105
'moshiKt' : "com.squareup.moshi:moshi-kotlin:$moshi",
109106
'moshiKotlin' : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
110107
'moshiAdapters' : "com.squareup.moshi:moshi-adapters:$moshi",
108+
'paparazzi' : "app.cash.paparazzi:paparazzi:$paparazzi",
109+
'paparazziPlugin' : "app.cash.paparazzi:paparazzi-gradle-plugin:$paparazzi",
111110
'retrofit' : "com.squareup.retrofit2:retrofit:$retrofit",
112111
'retrofitMoshi' : "com.squareup.retrofit2:converter-moshi:$retrofit"
113112
],

0 commit comments

Comments
 (0)