From a796807496e6ed2106385f1ed8b5d2a11726b5a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:21:33 +0000 Subject: [PATCH] TP-52884 | Bump app.cash.paparazzi from 1.3.1 to 1.3.3 (#370) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shivam Goyal --- build.gradle | 20 +++++++++++++++++++ gradle.properties | 1 - gradle/libs.versions.toml | 2 +- .../com/navi/uitron/render/ImageRenderer.kt | 7 ++++--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 6c7afc4..499d601 100644 --- a/build.gradle +++ b/build.gradle @@ -39,3 +39,23 @@ allprojects { } } } + +subprojects { + plugins.withId("app.cash.paparazzi") { + // Defer until afterEvaluate so that testImplementation is created by Android plugin. + afterEvaluate { + dependencies.constraints { + add("testImplementation", "com.google.guava:guava") { + attributes { + attribute( + TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, + objects.named(TargetJvmEnvironment, TargetJvmEnvironment.STANDARD_JVM) + ) + } + because("LayoutLib and sdk-common depend on Guava's -jre published variant." + + "See https://github.com/cashapp/paparazzi/issues/906.") + } + } + } + } +} diff --git a/gradle.properties b/gradle.properties index a2e90d8..f19c7b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,4 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0bc7c1b..03ad50f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ mvel2 = "2.4.15.Final" navi-alfred = "1.0.20" navigation-compose = "2.6.0" okhttp-bom = "4.12.0" -paparazzi = "1.3.1" +paparazzi = "1.3.3" retrofit = "2.9.0" room = "2.5.2" spotless = "6.25.0" diff --git a/navi-uitron/src/main/java/com/navi/uitron/render/ImageRenderer.kt b/navi-uitron/src/main/java/com/navi/uitron/render/ImageRenderer.kt index 823d313..9cf4a39 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/render/ImageRenderer.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/render/ImageRenderer.kt @@ -125,9 +125,10 @@ class ImageRenderer : Renderer { rootView ) val uiTronProvider = remember { UiTronSdkManager.getDependencyProvider() } - val isImagePresentLocally by remember(uiTronImageData?.iconUrl) { - mutableStateOf(uiTronProvider.getIconResourceId(uiTronImageData?.iconUrl)) - } + val isImagePresentLocally by + remember(uiTronImageData?.iconUrl) { + mutableStateOf(uiTronProvider.getIconResourceId(uiTronImageData?.iconUrl)) + } isImagePresentLocally?.let { ImageProvider( drawableResourceId = it,