diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index fe63bb6..6d0ee1c 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 74aba41..9c6a009 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,29 +28,3 @@ apply(from = "$rootDir/config/kover.gradle") subprojects { apply(from = "$rootDir/config/detekt.gradle") } - -// See https://github.com/cashapp/paparazzi/releases/tag/1.3.2 -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::class.java, - 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/libs.versions.toml b/gradle/libs.versions.toml index 2ec4eb3..34f74ae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,6 @@ android-library = { id = "com.android.library", version.ref = "agp" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" } -paparazzi = { id = "app.cash.paparazzi", version = "1.3.3" } +paparazzi = { id = "app.cash.paparazzi", version = "1.3.4" } [bundles] diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NIGHT].png index 400194b..6b7608f 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bffa1a7ba79e11e90314eba327d3ced0ee12e90a157c90319a580c48f4d2bb40 -size 82739 +oid sha256:1b63a7e577b506ce38205bf3842335559d34f872937b634c54ea5cea46068c01 +size 78859 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NOTNIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NOTNIGHT].png index 8dc0513..bb74498 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NOTNIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_List Item 3 lines[Mode: NOTNIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c75b247b6af3820bc2a37732ab20f79a23e8f68fa7911d1e53e6cf2801a13c3 -size 81571 +oid sha256:1ab29e2509c3b0e037e514b95e0953ca6f4ade95399196995204265660123680 +size 77555 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NIGHT].png index af52829..0a651c7 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e81826700fc6213374ce644ba4bd828766d0ea818978db36c82198cedb5a97db -size 37986 +oid sha256:86512e1ef01058ab93ce6705473af386d401a7440e54dd97c5838abcbea95e12 +size 35312 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NOTNIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NOTNIGHT].png index 46a19d3..b00af95 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NOTNIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 1 line[Mode: NOTNIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4efa6449d68ab637b3ebc14fddfe3ef7c09bcd887b43d1c3346f7cf449cdfac -size 37748 +oid sha256:cddb564542188aa9e39ed050aa5d4ca4bfbb45be75851e01af0736acac06a31a +size 35104 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NIGHT].png index 75e0abc..b9dcbbd 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e604e6737978f84b7cb00cb71351308d7afd4e96b7dd80fdbc07434238f4f134 -size 45304 +oid sha256:fcf0dc29b581b0abb8a5409ec3baee0e1e7782978d697d435b5bc34b1634b63f +size 43125 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NOTNIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NOTNIGHT].png index 526db2b..889f44c 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NOTNIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem 2 lines[Mode: NOTNIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45bfafdf59de5f730fc04ad23190b37130f4a426cc0a02956160ad1bf5360e6c -size 44985 +oid sha256:1e175fb387b219a80f75d79cc30d35a1c392988d34a386e736f3aef81dcc4e0a +size 42669 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_1.png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_1.png index aaaf3c9..ab2ae8f 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_1.png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0742b69d63da716c95f6234e867171badbd982583f81d3d02d37a0ecfa6f1d0e -size 6103 +oid sha256:bff540faf3c3425690390108fb7e366aac6a126a9e9a0c9a99d40d10256dccfd +size 5162 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_2.png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_2.png index ffbc42d..1505056 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_2.png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fa3082aece747380fd80f0ff4b0bd7590582d3633a93a92f8a414887fa76a05 -size 11659 +oid sha256:63595844bf1cf0d501f2c7f5e52e3a539276adbb5b6b7e108b60cda3845da17d +size 10352 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_3.png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_3.png index dbce199..8969311 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_3.png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NIGHT]_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be5fdc2d1f4cbd8d107ca6173f696d1fd6701748b45349ec14ddbb3e3f2a7308 -size 13615 +oid sha256:f3bebc19ec38f6cdb9fe8246fd5a1c91859537ea96c67fa952ed6bae804c13f4 +size 12357 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_1.png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_1.png index 4991251..3f2f954 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_1.png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fb7c57a432fae3980923341bacef7ff9a6adb32ec0045cef7c82d04593dda78 -size 6133 +oid sha256:d98312b1e9aa11c1fe57cf2b3e789eb21d90ac450287a6e9d0936fb7dd790ded +size 5211 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_2.png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_2.png index 6b0c91c..d4d70ff 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_2.png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b08e4f5f8edff6c314079a8b76e8d4fd01db0e1cef12a4bd160d6b29f5c1bbcc -size 11554 +oid sha256:582ffe14984c59f1b9ee4041d0a7bc01368c257122f4e3793172c7beabbbba12 +size 10247 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_3.png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_3.png index d40c061..f8e1681 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_3.png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem change size[Mode: NOTNIGHT]_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16c29454b491cf37d48c4eaccb28c5a7114eec94db66102c50e817485b9243d3 -size 13575 +oid sha256:b6f1b0919ea2035ba5ced0b2f0686230adc03464dcd36f767d1ac700cc34a641 +size 12234 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NIGHT].png index d484aed..ba39ed5 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6290ddeaedbd4b98a2b0ceddf1b875194089854f45f579b78d1e5ed7dcfa927e -size 6143 +oid sha256:cb78b49417b9de0209bf4b3b59ea12fcc8fb2e310f67e9ddace36f891c139b2f +size 5188 diff --git a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NOTNIGHT].png b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NOTNIGHT].png index 41adf86..893232a 100644 --- a/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NOTNIGHT].png +++ b/listitem/src/test/snapshots/images/net.nicbell.materiallists_ListItemTest_ListItem programmatic[Mode: NOTNIGHT].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de37bcaaa11ee02006eeada1e634c730bb88f05e056e9d6f021f6a71075320df -size 6178 +oid sha256:5d32989c2f732d798ce9f54e6a6a71931f72d0505ee842434dd771e63bfe75db +size 5224