From b02230d89d480f78e080191f2cd8e924fdccc0c7 Mon Sep 17 00:00:00 2001 From: Nick Cipollo Date: Thu, 5 May 2022 10:19:04 -0400 Subject: [PATCH 01/17] Update gradle properties to accomodate fork --- paparazzi/gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 57ed4dec1f..1cd3320422 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,10 +1,10 @@ -GROUP=app.cash.paparazzi -VERSION_NAME=1.1.0 +GROUP=com.whoop.paparazzi +VERSION_NAME=0.100.0 -POM_URL=https://github.com/cashapp/paparazzi/ -POM_SCM_URL=https://github.com/cashapp/paparazzi/ -POM_SCM_CONNECTION=scm:git:git://github.com/cashapp/paparazzi.git -POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/cashapp/paparazzi.git +POM_URL=https://github.com/WhoopInc/paparazzi/ +POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ +POM_SCM_CONNECTION=scm:git:git://github.com/WhoopInc/paparazzi.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/WhoopInc/paparazzi.git POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt @@ -12,7 +12,7 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=cashapp POM_DEVELOPER_NAME=CashApp -POM_DEVELOPER_URL=https://github.com/cashapp/ +POM_DEVELOPER_URL=https://github.com/WhoopInc/ SONATYPE_HOST=DEFAULT RELEASE_SIGNING_ENABLED=true From 7514ded5bf5ccfa922163105e890fdaffa22cb17 Mon Sep 17 00:00:00 2001 From: Nick Cipollo Date: Thu, 5 May 2022 11:56:54 -0400 Subject: [PATCH 02/17] Update group and version name to point to whoop variant --- paparazzi/gradle.properties | 2 +- .../src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 1cd3320422..aee3b9fb44 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=0.100.0 +VERSION_NAME=0.100.1 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ diff --git a/paparazzi/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt index 44551426e1..f8395cf254 100644 --- a/paparazzi/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt +++ b/paparazzi/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt @@ -234,7 +234,7 @@ class PaparazziPlugin : Plugin { private fun Project.addTestDependency() { configurations.getByName("testImplementation").dependencies.add( - dependencies.create("app.cash.paparazzi:paparazzi:$VERSION") + dependencies.create("com.whoop.paparazzi:paparazzi:$VERSION") ) } From b323548ace34aaeb2dfe02e95d5b1a0585413528 Mon Sep 17 00:00:00 2001 From: Nick Cipollo Date: Thu, 5 May 2022 14:31:38 -0400 Subject: [PATCH 03/17] Expose recording option --- paparazzi/gradle.properties | 2 +- .../src/main/java/app/cash/paparazzi/HtmlReportWriter.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index aee3b9fb44..8155db62e4 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=0.100.1 +VERSION_NAME=0.100.3 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ diff --git a/paparazzi/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt b/paparazzi/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt index 1808440b9d..e1258c5e5e 100644 --- a/paparazzi/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt +++ b/paparazzi/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt @@ -60,7 +60,8 @@ import javax.imageio.ImageIO class HtmlReportWriter @JvmOverloads constructor( private val runName: String = defaultRunName(), private val rootDirectory: File = File("${System.getProperty("paparazzi.build.dir", "build")}/reports/paparazzi"), - snapshotRootDirectory: File = File("src/test/snapshots") + snapshotRootDirectory: File = File("src/test/snapshots"), + private val isRecording: Boolean = isRecordingDefault() ) : SnapshotHandler { private val runsDirectory: File = File(rootDirectory, "runs") private val imagesDirectory: File = File(rootDirectory, "images") @@ -71,9 +72,6 @@ class HtmlReportWriter @JvmOverloads constructor( private val shots = mutableListOf() - private val isRecording: Boolean = - System.getProperty("paparazzi.test.record")?.toBoolean() == true - init { runsDirectory.mkdirs() imagesDirectory.mkdirs() @@ -292,3 +290,5 @@ internal val filenameSafeChars = CharMatcher.inRange('a', 'z') internal fun String.sanitizeForFilename(): String? { return filenameSafeChars.negate().replaceFrom(toLowerCase(Locale.US), '_') } + +private fun isRecordingDefault() = System.getProperty("paparazzi.test.record")?.toBoolean() == true From afca23705d903a5aa3d7911093e66a251061cf33 Mon Sep 17 00:00:00 2001 From: Nick Cipollo Date: Sat, 4 Jun 2022 13:00:15 -0400 Subject: [PATCH 04/17] Prepare 1.100.1 release --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 8155db62e4..de486df9ea 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=0.100.3 +VERSION_NAME=1.100.1 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ From 705eaaea68ef67238e1af33d3693b485300c16d0 Mon Sep 17 00:00:00 2001 From: Chuck Stein Date: Wed, 11 Jan 2023 18:40:10 -0500 Subject: [PATCH 05/17] Explicitly use cashapp's 1.1.0 release of `paparazzi-gradle-plugin` instead of the version on whoop's nexus to fix `:sample` CI failures --- build.gradle | 4 +--- settings.gradle | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ae45a10b78..d7b2ce9412 100644 --- a/build.gradle +++ b/build.gradle @@ -14,9 +14,7 @@ buildscript { classpath libs.plugin.versions classpath libs.plugin.spotless - // Normally you would declare a version here, but we use dependency substitution in - // settings.gradle to use the version built from inside the repo. - classpath 'app.cash.paparazzi:paparazzi-gradle-plugin' + classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0' } } diff --git a/settings.gradle b/settings.gradle index 0951a2360d..6bf4adc3e6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,6 @@ includeBuild('paparazzi') { dependencySubstitution { substitute module('app.cash.paparazzi:paparazzi') using project(':paparazzi') substitute module('app.cash.paparazzi:paparazzi-agent') using project(':paparazzi-agent') - substitute module('app.cash.paparazzi:paparazzi-gradle-plugin') using project(':paparazzi-gradle-plugin') } } From adfc7d9e99b0abe53fd4e02a399ff9a3c6c0ee67 Mon Sep 17 00:00:00 2001 From: Chuck Stein Date: Thu, 12 Jan 2023 15:28:32 -0500 Subject: [PATCH 06/17] Prepare 1.101.1 release --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index de486df9ea..342c998084 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=1.100.1 +VERSION_NAME=1.101.1 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ From 346c59672cd79579b8133071e2c05647fd2702fa Mon Sep 17 00:00:00 2001 From: Chuck Stein Date: Fri, 13 Jan 2023 09:17:49 -0500 Subject: [PATCH 07/17] Disable release signing because we don't have the signing key CI was failing due to not being able to locate this key. Disabling it should be fine because we are only publishing to our private nexus repo, not maven central. --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 342c998084..b2c36aa280 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -15,7 +15,7 @@ POM_DEVELOPER_NAME=CashApp POM_DEVELOPER_URL=https://github.com/WhoopInc/ SONATYPE_HOST=DEFAULT -RELEASE_SIGNING_ENABLED=true +RELEASE_SIGNING_ENABLED=false org.gradle.caching=true org.gradle.parallel=true From 8734b2d3e848b76bb177de60afb7d8a249a442c9 Mon Sep 17 00:00:00 2001 From: "mayank.saini" Date: Fri, 29 Sep 2023 12:29:10 -0400 Subject: [PATCH 08/17] Resolve conflicts --- paparazzi/gradle.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 13d36287e9..1064494977 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,3 +1,24 @@ +GROUP=com.whoop.paparazzi +VERSION_NAME=0.100.0 + +POM_URL=https://github.com/WhoopInc/paparazzi/ +POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ +POM_SCM_CONNECTION=scm:git:git://github.com/WhoopInc/paparazzi.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/WhoopInc/paparazzi.git + +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo + +POM_DEVELOPER_ID=cashapp +POM_DEVELOPER_NAME=CashApp +POM_DEVELOPER_URL=https://github.com/WhoopInc/ + +SONATYPE_HOST=DEFAULT +RELEASE_SIGNING_ENABLED=true + +org.gradle.caching=true +org.gradle.parallel=true POM_ARTIFACT_ID=paparazzi POM_NAME=Paparazzi POM_DESCRIPTION=An Android library to render your application screens without a physical device or emulator From cef49ea00339427c3dd1a55f6792be1eac6214f6 Mon Sep 17 00:00:00 2001 From: "mayank.saini" Date: Fri, 29 Sep 2023 12:30:57 -0400 Subject: [PATCH 09/17] Resolve conflicts --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 1064494977..831c95c67f 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=0.100.0 +VERSION_NAME=0.100.1 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ From 48019288871c39370a7617a60a1487e8c4256a7b Mon Sep 17 00:00:00 2001 From: Nick Cipollo Date: Thu, 5 May 2022 14:31:38 -0400 Subject: [PATCH 10/17] Expose recording option --- paparazzi/gradle.properties | 2 +- .../src/main/java/app/cash/paparazzi/HtmlReportWriter.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 831c95c67f..e052f49312 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=0.100.1 +VERSION_NAME=0.100.3 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ diff --git a/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt b/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt index 1808440b9d..e1258c5e5e 100644 --- a/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt +++ b/paparazzi/src/main/java/app/cash/paparazzi/HtmlReportWriter.kt @@ -60,7 +60,8 @@ import javax.imageio.ImageIO class HtmlReportWriter @JvmOverloads constructor( private val runName: String = defaultRunName(), private val rootDirectory: File = File("${System.getProperty("paparazzi.build.dir", "build")}/reports/paparazzi"), - snapshotRootDirectory: File = File("src/test/snapshots") + snapshotRootDirectory: File = File("src/test/snapshots"), + private val isRecording: Boolean = isRecordingDefault() ) : SnapshotHandler { private val runsDirectory: File = File(rootDirectory, "runs") private val imagesDirectory: File = File(rootDirectory, "images") @@ -71,9 +72,6 @@ class HtmlReportWriter @JvmOverloads constructor( private val shots = mutableListOf() - private val isRecording: Boolean = - System.getProperty("paparazzi.test.record")?.toBoolean() == true - init { runsDirectory.mkdirs() imagesDirectory.mkdirs() @@ -292,3 +290,5 @@ internal val filenameSafeChars = CharMatcher.inRange('a', 'z') internal fun String.sanitizeForFilename(): String? { return filenameSafeChars.negate().replaceFrom(toLowerCase(Locale.US), '_') } + +private fun isRecordingDefault() = System.getProperty("paparazzi.test.record")?.toBoolean() == true From 52f7e7d67d51794821454904778a968aabba875e Mon Sep 17 00:00:00 2001 From: Nick Cipollo Date: Sat, 4 Jun 2022 13:00:15 -0400 Subject: [PATCH 11/17] Prepare 1.100.1 release --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index e052f49312..f0bb54c33d 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=0.100.3 +VERSION_NAME=1.100.1 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ From 095d4daa4a917bef1369e16564fcefa8b3792cec Mon Sep 17 00:00:00 2001 From: "mayank.saini" Date: Fri, 29 Sep 2023 12:32:40 -0400 Subject: [PATCH 12/17] Fix build.gradle --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9e2a012680..39a04c3b47 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,7 @@ buildscript { classpath libs.plugin.ksp classpath libs.grgit - // Normally you would declare a version here, but we use dependency substitution in - // settings.gradle to use the version built from inside the repo. - classpath 'app.cash.paparazzi:paparazzi-gradle-plugin' + classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0' } } From 29debcd1e0de3d3ae8c9f0dba3429dd7b966ddd3 Mon Sep 17 00:00:00 2001 From: "mayank.saini" Date: Fri, 29 Sep 2023 12:33:30 -0400 Subject: [PATCH 13/17] Resolve conflicts --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 39a04c3b47..9e2a012680 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,9 @@ buildscript { classpath libs.plugin.ksp classpath libs.grgit - classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0' + // Normally you would declare a version here, but we use dependency substitution in + // settings.gradle to use the version built from inside the repo. + classpath 'app.cash.paparazzi:paparazzi-gradle-plugin' } } From 4ade8ff0d81992b21087d15cfaa45371dd25a25d Mon Sep 17 00:00:00 2001 From: Chuck Stein Date: Thu, 12 Jan 2023 15:28:32 -0500 Subject: [PATCH 14/17] Prepare 1.101.1 release --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index f0bb54c33d..6c311482b3 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.whoop.paparazzi -VERSION_NAME=1.100.1 +VERSION_NAME=1.101.1 POM_URL=https://github.com/WhoopInc/paparazzi/ POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ From 264378f254e861f4d4acdfae986cc0b1a48bc607 Mon Sep 17 00:00:00 2001 From: Chuck Stein Date: Fri, 13 Jan 2023 09:17:49 -0500 Subject: [PATCH 15/17] Disable release signing because we don't have the signing key CI was failing due to not being able to locate this key. Disabling it should be fine because we are only publishing to our private nexus repo, not maven central. --- paparazzi/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 6c311482b3..2427370a74 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -15,7 +15,7 @@ POM_DEVELOPER_NAME=CashApp POM_DEVELOPER_URL=https://github.com/WhoopInc/ SONATYPE_HOST=DEFAULT -RELEASE_SIGNING_ENABLED=true +RELEASE_SIGNING_ENABLED=false org.gradle.caching=true org.gradle.parallel=true From d1f9ab11af4cc506be3dbf20397c999af5315f88 Mon Sep 17 00:00:00 2001 From: "mayank.saini" Date: Fri, 29 Sep 2023 12:53:16 -0400 Subject: [PATCH 16/17] Update gradle plugin --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 39a04c3b47..9e2a012680 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,9 @@ buildscript { classpath libs.plugin.ksp classpath libs.grgit - classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0' + // Normally you would declare a version here, but we use dependency substitution in + // settings.gradle to use the version built from inside the repo. + classpath 'app.cash.paparazzi:paparazzi-gradle-plugin' } } From 8784ba7b171ba6086f1cf5df94d0cc0851b3fc20 Mon Sep 17 00:00:00 2001 From: "mayank.saini" Date: Fri, 29 Sep 2023 13:04:43 -0400 Subject: [PATCH 17/17] Fix gradle.properties --- gradle.properties | 24 ++++++++---------------- paparazzi/gradle.properties | 9 +++++---- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6e512e7172..6ce910683d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ -GROUP=app.cash.paparazzi -VERSION_NAME=1.3.1 +GROUP=com.whoop.paparazzi +VERSION_NAME=1.102.0 -POM_URL=https://github.com/cashapp/paparazzi/ -POM_SCM_URL=https://github.com/cashapp/paparazzi/ -POM_SCM_CONNECTION=scm:git:git://github.com/cashapp/paparazzi.git -POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/cashapp/paparazzi.git +POM_URL=https://github.com/WhoopInc/paparazzi/ +POM_SCM_URL=https://github.com/WhoopInc/paparazzi/ +POM_SCM_CONNECTION=scm:git:git://github.com/WhoopInc/paparazzi.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/WhoopInc/paparazzi.git POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt @@ -12,18 +12,10 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=cashapp POM_DEVELOPER_NAME=CashApp -POM_DEVELOPER_URL=https://github.com/cashapp/ +POM_DEVELOPER_URL=https://github.com/WhoopInc/ SONATYPE_HOST=DEFAULT -RELEASE_SIGNING_ENABLED=true -SONATYPE_AUTOMATIC_RELEASE=true +RELEASE_SIGNING_ENABLED=false org.gradle.caching=true org.gradle.parallel=true -org.gradle.jvmargs=-Xmx4g -android.useAndroidX=true - -# Signals to our own plugin that we are building within the repo. -app.cash.paparazzi.internal=true - -#app.cash.paparazzi.legacy.resource.loading=true diff --git a/paparazzi/gradle.properties b/paparazzi/gradle.properties index 2427370a74..2a95433e71 100644 --- a/paparazzi/gradle.properties +++ b/paparazzi/gradle.properties @@ -1,3 +1,8 @@ +POM_ARTIFACT_ID=paparazzi +POM_NAME=Paparazzi +POM_DESCRIPTION=An Android library to render your application screens without a physical device or emulator +POM_PACKAGING=jar + GROUP=com.whoop.paparazzi VERSION_NAME=1.101.1 @@ -19,7 +24,3 @@ RELEASE_SIGNING_ENABLED=false org.gradle.caching=true org.gradle.parallel=true -POM_ARTIFACT_ID=paparazzi -POM_NAME=Paparazzi -POM_DESCRIPTION=An Android library to render your application screens without a physical device or emulator -POM_PACKAGING=jar