From 0d891b85ed1135ed593e7b63c29e6bb6ebf833f5 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Mon, 12 Aug 2024 12:03:51 +0200 Subject: [PATCH] Update skiko to 0.8.11 (#1486) It's based on skia m126 Skiko update PR: https://github.com/JetBrains/skiko/pull/969 ## Testing - The demo runs on all platforms - The tests passed This should be tested by QA ## Release Notes ### Highlights - Multiple Platforms - Skiko version was updated to 0.8.11 (It is based on skia m126 release) --- .../ui/text/platform/DesktopFont.desktop.kt | 8 ++++---- .../platform/JetBrainsRuntimeFontFamilies.kt | 5 +++-- .../compose/ui/text/DesktopFontTest.kt | 5 +++-- .../ui/text/platform/NativeFont.native.kt | 7 +++++-- .../compose/ui/text/platform/WebFont.kt | 7 +++++-- ...eneTest_change_density_frame1_density2.png | Bin 348 -> 338 bytes ...eneTest_change_density_frame2_density3.png | Bin 432 -> 443 bytes ...eComposeSceneTest_run_dialog_in_center.png | Bin 176 -> 176 bytes ...ompose_ui_graphics_DesktopPathTest_arc.png | Bin 197 -> 213 bytes ...ose_ui_graphics_DesktopPathTest_bezier.png | Bin 178 -> 208 bytes ...e_ui_graphics_DesktopPathTest_clipPath.png | Bin 253 -> 255 bytes ...pose_ui_graphics_DesktopPathTest_cubic.png | Bin 188 -> 211 bytes ...se_ui_graphics_DesktopPathTest_figures.png | Bin 196 -> 202 bytes ..._ui_graphics_DesktopPathTest_linesFill.png | Bin 139 -> 139 bytes ...i_graphics_DesktopPathTest_linesStroke.png | Bin 159 -> 171 bytes ...nvas_DesktopCanvasPointsTest_drawLines.png | Bin 164 -> 186 bytes ...vas_DesktopCanvasPointsTest_drawPoints.png | Bin 156 -> 144 bytes ...s_DesktopCanvasPointsTest_drawPolygons.png | Bin 195 -> 215 bytes ...phics_canvas_DesktopCanvasTest_drawArc.png | Bin 265 -> 295 bytes ...cs_canvas_DesktopCanvasTest_drawCircle.png | Bin 157 -> 151 bytes ...hics_canvas_DesktopCanvasTest_drawLine.png | Bin 193 -> 183 bytes ...hics_canvas_DesktopCanvasTest_drawOval.png | Bin 185 -> 200 bytes ...canvas_DesktopCanvasTest_drawRoundRect.png | Bin 163 -> 171 bytes ...ics_canvas_DesktopCanvasTest_transform.png | Bin 185 -> 181 bytes ...ose_ui_platform_GraphicsLayerTest_clip.png | Bin 258 -> 301 bytes ...i_platform_GraphicsLayerTest_elevation.png | Bin 521 -> 522 bytes ...i_platform_GraphicsLayerTest_rotationX.png | Bin 528 -> 611 bytes ...platform_GraphicsLayerTest_rotationXYZ.png | Bin 1241 -> 1364 bytes ...i_platform_GraphicsLayerTest_rotationY.png | Bin 836 -> 898 bytes ...i_platform_GraphicsLayerTest_rotationZ.png | Bin 701 -> 842 bytes ...ResourcesTest_load_SVG_and_fill_bounds.png | Bin 6722 -> 6709 bytes ...esourcesTest_load_SVG_with_custom_size.png | Bin 1337 -> 1587 bytes ...urcesTest_load_SVG_with_specified_size.png | Bin 3089 -> 3086 bytes ...cesTest_load_SVG_with_unspecified_size.png | Bin 3089 -> 3086 bytes ...Test_load_SVG_with_unspecified_viewbox.png | Bin 3089 -> 3086 bytes ...th_unspecified_viewbox_and_fill_bounds.png | Bin 6722 -> 6709 bytes gradle/libs.versions.toml | 2 +- 37 files changed, 21 insertions(+), 13 deletions(-) diff --git a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt index 8cf24b0cd72bb..e9c9bfee84aa5 100644 --- a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt +++ b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt @@ -24,7 +24,6 @@ import org.jetbrains.skia.Data import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant import org.jetbrains.skia.FontWidth -import org.jetbrains.skia.makeFromFile actual sealed class PlatformFont : Font { actual abstract val identity: String @@ -168,10 +167,11 @@ internal actual fun loadTypeface(font: Font): SkTypeface { return when (font) { is ResourceFont -> typefaceResource(font.name) // TODO: replace with FontMgr.makeFromFile(font.file.toString()) - is FileFont -> SkTypeface.makeFromFile(font.file.toString()) + is FileFont -> FontMgr.default.makeFromFile(font.file.toString()) is LoadedFont -> FontMgr.default.makeFromData(Data.makeFromBytes(font.getData())) is SystemFont -> FontMgr.default.matchFamilyStyle(font.identity, font.skFontStyle) - } ?: SkTypeface.makeFromName(SkTypeface.makeDefault().familyName, font.skFontStyle) + } ?: (FontMgr.default.legacyMakeTypeface(font.identity, font.skFontStyle) + ?: error("loadTypeface legacyMakeTypeface failed")) } private fun typefaceResource(resourceName: String): SkTypeface { @@ -181,7 +181,7 @@ private fun typefaceResource(resourceName: String): SkTypeface { ?: error("Can't load font from $resourceName") val bytes = resource.use { it.readAllBytes() } - return SkTypeface.makeFromData(Data.makeFromBytes(bytes)) + return FontMgr.default.makeFromData(Data.makeFromBytes(bytes))!! } private val Font.skFontStyle: SkFontStyle diff --git a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt index bcce1f0af9c11..4bbe74a84218a 100644 --- a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt +++ b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.text.font.FontWeight import java.io.File import kotlin.io.path.Path import kotlin.io.path.absolutePathString +import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant -import org.jetbrains.skia.makeFromFile internal object JetBrainsRuntimeFontFamilies { @@ -97,7 +97,8 @@ internal object JetBrainsRuntimeFontFamilies { val absolutePath = path.absolutePathString() // We need to parse the typeface to extract its weight and style - val typeface = org.jetbrains.skia.Typeface.makeFromFile(absolutePath) + val typeface = FontMgr.default.makeFromFile(absolutePath) + ?: error("makeFromFile $absolutePath failed") val weight = FontWeight(typeface.fontStyle.weight) val style = when (typeface.fontStyle.slant) { FontSlant.UPRIGHT -> FontStyle.Normal diff --git a/compose/ui/ui-text/src/desktopTest/kotlin/androidx/compose/ui/text/DesktopFontTest.kt b/compose/ui/ui-text/src/desktopTest/kotlin/androidx/compose/ui/text/DesktopFontTest.kt index 778dcd55378b9..7c9a1dafb4f5c 100644 --- a/compose/ui/ui-text/src/desktopTest/kotlin/androidx/compose/ui/text/DesktopFontTest.kt +++ b/compose/ui/ui-text/src/desktopTest/kotlin/androidx/compose/ui/text/DesktopFontTest.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.text.platform.Typeface import androidx.compose.ui.text.platform.aliases import com.google.common.truth.Truth import org.jetbrains.skia.Data -import org.jetbrains.skia.Typeface +import org.jetbrains.skia.FontMgr import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -56,7 +56,8 @@ class DesktopFontTest { .contextClassLoader .getResourceAsStream("font/sample_font.ttf")!! .readAllBytes() - Typeface.makeFromData(Data.makeFromBytes(bytes)) + FontMgr.default.makeFromData(Data.makeFromBytes(bytes)) + ?: error("loadedTypeface failed: FontMgr.default.makeFromData returned null") } private val loadedFontFamily by lazy { diff --git a/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt b/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt index c4d22b17562b6..b00761738fda2 100644 --- a/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt +++ b/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt @@ -21,6 +21,7 @@ import org.jetbrains.skia.FontStyle as SkFontStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontStyle import org.jetbrains.skia.Data +import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant import org.jetbrains.skia.FontWidth @@ -30,8 +31,10 @@ internal actual fun loadTypeface(font: Font): SkTypeface { } @Suppress("REDUNDANT_ELSE_IN_WHEN") return when (font) { - is LoadedFont -> SkTypeface.makeFromData(Data.makeFromBytes(font.getData())) - is SystemFont -> SkTypeface.makeFromName(font.identity, font.skFontStyle) + is LoadedFont -> FontMgr.default.makeFromData(Data.makeFromBytes(font.getData())) + ?: error("loadTypeface makeFromData failed") + is SystemFont -> FontMgr.default.legacyMakeTypeface(font.identity, font.skFontStyle) + ?: error("loadTypeface legacyMakeTypeface failed") // TODO: compilation fails without `else` see https://youtrack.jetbrains.com/issue/KT-43875 else -> throw IllegalArgumentException("Unsupported font type: $font") } diff --git a/compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt b/compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt index 6c80f23f81442..f5578d299fe0a 100644 --- a/compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt +++ b/compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt @@ -20,6 +20,7 @@ import org.jetbrains.skia.FontStyle as SkFontStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontStyle import org.jetbrains.skia.Data +import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant import org.jetbrains.skia.FontWidth import org.jetbrains.skiko.OS @@ -30,8 +31,10 @@ internal actual fun loadTypeface(font: Font): SkTypeface { throw IllegalArgumentException("Unsupported font type: $font") } return when (font) { - is LoadedFont -> SkTypeface.makeFromData(Data.makeFromBytes(font.getData())) - is SystemFont -> SkTypeface.makeFromName(font.identity, font.skFontStyle) + is LoadedFont -> FontMgr.default.makeFromData(Data.makeFromBytes(font.getData())) + ?: error("loadTypeface makeFromData failed") + is SystemFont -> FontMgr.default.legacyMakeTypeface(font.identity, font.skFontStyle) + ?: error("loadTypeface legacyMakeTypeface failed") } } diff --git a/golden/compose/ui/ui-desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame1_density2.png b/golden/compose/ui/ui-desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame1_density2.png index d4974ca824dc0a66ae583578663ff467f67d53fb..01ac6302b7157c88ffcd7cc38b2238f31cee26d2 100644 GIT binary patch delta 295 zcmV+?0oeZB0@4DIG=B+6L_t(o!|j$q3c@fDMc>q-D-YnETzF`~BX|r2H)^%xq7kJ{ zW0`8GFb@VonjxQ`xq(gL3JJnWAPhzFD5e6 z9hA=a(*w|+@sE#q_@+84X1)+r%Jk7S=oa)4YTL|BL)->bdulTUfxCpj-4p~K69SL^ tH#2~}@tZ%Ae;|n&$8j9TaUAE5c>tUDh)sD~r}zK>002ovPDHLkV1ka5fn5Lq delta 305 zcmV-10nYx?0^9Kd}-4 z1Mm$TLY@b>X+2KWUqBx@jUhyzW6*hk7B!hZ%+qGGA0ah~0uvnPby%>HbD*Kj1Y`Ca zpI!{I&>gf{erW-;kl*--*EiKBo4JBjiTb4%&?{&MQplfcg406O0I4nk*wp~2MC@w+ zS+E)a-xBZMeJV-*0NH^)#^tC6&gF8sTrQW(^^f%ft44?rDNm0e00000NkvXXu0mjf Dny`z& diff --git a/golden/compose/ui/ui-desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame2_density3.png b/golden/compose/ui/ui-desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame2_density3.png index 4e51bffc3def80745207eed27a26b42933915b2d..c65dd5359fb1de37e4d667e3ef8fcca41bb99851 100644 GIT binary patch delta 401 zcmV;C0dD@V1G@u|G=FkQL_t(o!|j(nP6IIzM&B$OT6%;;%W-l6iX1Q!Wm3ZdxCByK zL<5BNP^`1^{wChoF-ZQTDV*4|FJpVYjVLG{5|Ht)ngCb;*Q)yNm0#or_y&FeEeWG8 zbkTwJ&DE?e2rD;vF*ASR{J@}qG6FdVu*ng+f?eQq0Ew~1V}BRs&z!;F%77U#10GQ+ zzO6t9yjz_xKxLiu3q<4=D1obPk8@VLt13IL0i(9)1z6*+j#!`CITf(CfEo|5?IU{! zP$mG46B@pPV$=4W*f;=FfbJn_#%1uTY0rhL6K!t@GEfD@*%ayZ2s84|I0V=QjZne< z*m!1XfyOz5?SHD88QB`hcxSNxusMJc+Kf1lklBD-rVnx!;Q#RA3rinC*Pw4U*7axU z!R|q~pgI!UdQLjPmkGE-Jg0(Nod9=;RSLk32jC_J;LZbZm;aLt=rz*ZU|YQO*y3fX vn|#Vec}m#_A3#4R;66a_veji}&CoCXybOl3SoeSc015yANkvXXu0mjf1uMI% delta 389 zcmV;00eb$s1F!>-G=FDFL_t(o!|j$$QiL!NMqeZ2)>(Tw=V;ypj^IturH-Us5UKD_ zAR$`CSJjIQo#xSmuSXOV4++Thr8WRAz@w^uc-0qq0=|H6Ky$*V51sX3eQULQGs4O( zo^7n3IS&{VP$nR^0Jb$kcd!q<2ap)Ac@NG}-5rD6eau5GdO43QM3y@`EqwaWO j3HolMOyqs1POa7tPS^K2cxI|Z00000NkvXXu0mjf7OSt~ diff --git a/golden/compose/ui/ui-desktop/androidx_compose_ui_ImageComposeSceneTest_run_dialog_in_center.png b/golden/compose/ui/ui-desktop/androidx_compose_ui_ImageComposeSceneTest_run_dialog_in_center.png index 5eb0b130c9af337413c6c743617a35c2e6230bcf..f6765d39a63d6ea63ef8279989c7118058edd686 100644 GIT binary patch delta 44 ycmdnMxPfs(x9ZdKX}l~P0t*# zL@TfpK~S!NEBq|7_(+}b&OK*f_|Jb3CO@%Z7v^8U^RN|`A)iQUIAJ05!{uE`0iQ$f z8P4jkRZ_qS({j-bhc-zA-iL0pP=!^vH6;ant$$WMcbylPh9VeafXyQ^!U^jR$FhG1 Xr9V{54ed^@00000NkvXXu0mjf_!mcc delta 153 zcmV;K0A~Ny0mT83G=F?aL_t(I%k9rm5rSY4Md6PoMj(O_h+qUF5Wxl-fe3#DBN%}O z*9UP18Dvym*~hzk&hE0;UI^z6Y$KF#`2#+MB6K0YNJcoJ6Y4O0E1AGUIK0Ak3|A!+ zIH8?4`!&f7?mum4m)@D3{kFMUkkn{!#0|w0D!5kMr}Gb;L=sR^6x*;c00000NkvXX Hu0mjfZwfxH diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_bezier.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_bezier.png index 89b58fdafb0254a435951985fc6963dd26f76e01..8ce7c274799a2a65982fc9b3cf7dbeea1eedfbe5 100644 GIT binary patch delta 164 zcmV;V09*gE0nh=EG=GOlL_t(I%capV4Z=_W1khIrgp~mU1OZe;C3Hjr8(6>rW=QG) zB%pwSXwEKY+M- z4=@f1RqxK(NF83K$bJAAjkMueifqDd06C5wwh7mvCe_HBR~@La!xl>{aDD@pqq6sD S0U`DP00000kQ#*G=6DGL_t(I%gxeF4S+BVhT#_{NT>v)OcD;j0Tw0&Cm)v`8Uo8o zFEnX-d(uAyJDCtjuw{UnLLBf75v&e~BZ6`RVu)aV0K!O3AunTuku!w|tOE=q ncjCI~o_HF4Hedm)C9NJ8Q3$gFyiLGg00000NkvXXu0mjfKCCXn diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_clipPath.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_clipPath.png index 11a7c032d6d23b664d6ca1ce9824353bd9264901..629d00a09eeaef9a668be2d055f214c73deb645e 100644 GIT binary patch delta 211 zcmV;^04)Fg0sjGzG=H{9L_t(I%k7ar3W9JLh98>*A!v|Lmj|eZiUh3iip86nKMY_Y7L_t(I%k7b|3W5L>MUQUb&=S@tB>4&A5A+-1mx;gO2bfN+ znu3E4WmBNE`5HW{SvS~`)n31 zn#Cg`Gfuka{Z8OYLqe(yngChF$a9D#PBE(6?0z#ZbRZ8g;Mn#j zzmc%}0hE!@gjWU9mXK2g@Vz9=!hI~#gmWcQd}kZ3waBCZtst?%3QH_7?{?aq9p0l` V)JaQ;bszu$002ovPDHLkV1gF%M+N`@ delta 144 zcmV;B0B`@(0lWc_G=FnRL_t(I%cap<4S+BVh2b9ulYoRdz{(`yV3UFbq~PH2!oxzK zyR=E4dh#W05fnTnkRW@3d87j7kQXqHd;nvJ;B+B^;|J(N1iJyW5kYDIHX>L%fF@F0 yh#&|qFA|NH4y}_qp$xEC#|2{5;TdgJtlSZz)}3r#&$s{p00{s|MNUMnLSTY*F*`B< diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_figures.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_figures.png index 48e3b6fcb28b07239fd4530f8f4e1ff394c9d428..c14cf8d5abc8dfb8d806884b682852052e040458 100644 GIT binary patch delta 158 zcmV;P0Ac^c0m=c8G=G6fL_t(I%hi#=34kyV1SfW&4QL4#V{w*Y8NT#ovnuD+F_F8cnHy0w}qrB88w841&WXAHi!=7dUPr zkev%2@_hh;POt@aIRT4lb-BCm;#M8Ff0g)3fH$+xed8+dITvp{0XocFC)23yf&c&j M07*qoM6N<$f{1!QWdHyG delta 152 zcmV;J0B8To0mK22G=F^m zd)x-*ax4fsK`+<@vf9k+DCEvaAOuTkx|(Z%$h87B*$RVTcjVo?>I(G!+tNj+RDqj0frAToHuh4sRR)0000}H%`9gzIv{DBJx95{j0hxtm*3)m*)b4+4=d#Wzp$PzI^CHdw delta 87 zcmV-d0I2_q0gC~UJ5cS-u?+wq3kgM*0qlk8OlhDefdBvi delta 114 zcmV-&0FD2v0iOYoG;3B#L_t(I%k9!Z3cw%?MA2VQ;QcS9H=1rzkYc1xw+;jsA&)>r zAVCvUoCM$_G2Cq=2CIz-6t9OofQ^iRg$!57YK?pVQsljTim&>GpE&?rJD+Tp8;fIX U(j{!+@&Et;07*qoM6N<$fjpoC)D2I+;#VIm3ArOn6a>x!@`wVD=3{f< wf^}I_!5(fr(m&!0@~-&k-2jID|J5lg`u3!nhD}M800000Ne4wvM6N<$f;WdgC;$Ke delta 119 zcmV--0Eqv(0i*$tG;musK#Erw~g RO>+PM002ovPDHLkV1hJzFf#xE diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawPolygons.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawPolygons.png index fe5f2a3f0d11b78b570bfeafc6ca459cfffca115..27a6dc87b55ff8a3d397a692f5d078c4492ed9fb 100644 GIT binary patch delta 171 zcmV;c0960O0oMVLG=GjsL_t(I%dL_z4#OY}MIW8JhfcZwi5e+OZ_p|i_!&Y}7nxwB ze#Bz=Jp%%q2(n-iNFYWcm@GUbsNm<2KrmNu4hstWvT&*Q1ueKK5E-!{-e=PZFBWzM z;(=IES+?nFo5^1|DsbT669itkhI3rt!ACtHXu%=D6)ikV002ovPDHLkV1kXDNN@lE delta 151 zcmV;I0BHZ$0mA{1G=F+YL_t(I%dOBs3VQ^aRG!1umf}ViGeWjeOCUM1M4ok2oM1w9!~%O002ovPDHLk FV1mg2KpOx6 diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawArc.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawArc.png index e8ca70a882388deb34d348099c0a8f8349abb1dc..4583371f892e898870c93df70d56e33dec2a391c 100644 GIT binary patch delta 251 zcmV}Hzll0dGh$&i!TRviAy0b002ovPDHLkV1m^& BaTovq delta 221 zcmV<303!dV0*L~UG=IQJL_t(I%cYZ16~Z7Gg+Ern3PvD;4O|2pNQ6Z&!WuXeNCa$P z180KkgVVVUcG$ceUV!_-{r`huEMb8?umf%&4>;foTreh(lyK-f>V91ZBq2SJjwy2! zHBTWzI_KRy4{?3w9CJL51yN<2r;rMSUt}IaJctu(C6xx$0#=)JXU!bqSpb3c3I*W* z0C+(59Ycyur8b}yY(Gie3V<7zt62bOQZ;wuIFV-$ZjSUw7AU*#Y`Zpwu3)u+`|s%& X8qU{MN?+0^00000NkvXXu0mjfX*F0& diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawCircle.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawCircle.png index 0898f6390ac26bb9b63465ef70f61660f28024a5..dceedb0c086d8c968134ffcd597cb3494a920e0c 100644 GIT binary patch delta 106 zcmV-w0G0op0ha-gG-FOlL_t(I%VS^|1z5p<1_q!13=Bv9Gcde|;v@eV7<`D;9Ppok z;Xe)>K#T#$@fdKN7y~}wG2jEbdL~N43!4Gg@u%61?{^M4%J zffxf0;4$C;F$Vm{gWsd8XCg6p7>P09ARYrQ&^{263_0+hf#Cxz@QBtt0s#Q1TT$Gd SsuE%V0000)qu22`^iL|u`KpMwX7 z%!LeZH(?MEp6V4ySRhfkp5hQvv1>761*riE*-l!oJDnLuCJ{n;AxC3X)HVTk^aH*C tFuF)}u}($W|372suWsOhTLG?SAYpV{0vP@?oM-sYaG&8n zLjX228qf?uH{b!oe>gl36J|nIqrHmZ!2kaY^-vxEQ89x&l2QY#29N_r4Hygtupo27 z!Wa%RFfbg1@E94<)ILB;3m3_8K><|bL#!!vzyJU{vMT-E2M*Kf00000NkvXXu0mjf D7DPJD diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawOval.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawOval.png index 11bbad772e41491e9c318ea539581c9e6aa0c068..a621059547517c1cdc01300f64e8b88a7eb423ec 100644 GIT binary patch delta 156 zcmV;N0Av5T0muQ6G=G0dL_t(I%k9y@3BphigyApN5Q~sp%thPq5KFMCR1`&ceP{uK zhxPIv1Q9Xus0(vgmRWY^=U>&h3D!7ZiyF&3x?~;ES0qoyHaG|Ip-w?l%w2GwU@p1^ zJ3*RZE=r59Qw;X`oH;LaWl1wJ#35L{!??)^#~7~|USj<5dKCaAH=Hf60C$uC0000< KMNUMnLSTYtfkLYQ delta 141 zcmV;80CNAx0l5K?G=FeOL_t(I%k7cf34kyVgTFd~o9GCR&<%7noyakS-W$R07*qoM6N<$g6iEjR{#J2 delta 118 zcmV-+0Ez#r0iywsG;dl-L_t(I%k7e}4Zt7}120U%sBFS-0-Ge8I1Laf3KaPkOYVFw z{1010f+)y>BGAO8W#SvQ1vGQ+aQXpvCj^(H;0(^`jsTdWz&s<`*BMPv7f@}PxF7$~ Y4M6Ch>|x=IV*mgE07*qoM6N<$f;_x2c>n+a diff --git a/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_transform.png b/golden/compose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_transform.png index 4e8fd1a7ceca8fa6fa6641b12d88e8911cab833f..b1152f2b86134c71c3dee67c9c6f77957b650dcb 100644 GIT binary patch delta 137 zcmV;40CxYm0kr{;G=FSKL_t(I%gvF&5r7~J1TWNMJN838R$&how0_*rj?1V^XT0G0000DF1SdL)|4RT|B_BLf4{u8=>s5y5JCn(#O>%NLK>@AD7U)riSIR$a)KUvK|7ADwrGO<;q6T zXfr#HO)KvPVA(V6KKu3SI;P;s(VW4~U}$hjg3$z<%3I6EY99wX@99p>Ra*~4N{PT6ui3N0?b(`LvKT> Q82|tP07*qoM6N<$f_;HuegFUf diff --git a/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_elevation.png b/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_elevation.png index 843f6d38a3af2573accca506971f639f68b04771..57c9343b31787606087a611480d8c38b5bac4888 100644 GIT binary patch delta 480 zcmV<60U!Q}1d0TZG=ITKL_t(o!|j)0PQx$^g`d3)xC4iPJ8@woj==$j#%l9pj%KnH z;vanq*&J9Osn)+~XXCc#vy50C#}CW5q}|F?9gu{%rSb^I>g3?u4X@g8LDG zJ8K+-q@w?Bw1OFugMj{i7$7?}djQqt;p%{Jka?LXut~%Kdw(lI6Cj)dttyfO^N_;; zeYED{gu#)1QRsE%+4CsHYD(R7Y=9f!2DqTiD1fIQp8XjhRa!nBB6iD8BB`8)%k7r8 zTG{}I!pZO@WljYcEe70M^X|GQj|sp7aHv?zUPuBRfHwh1twn~byPg300QeDj0dOn~ zMAS?OfKLEZB7Z>HexYFUTQ1}mQ#wy`w3bsv8dIh;Ap+o(+&YEe#MGuUSk2)~1~~=t zx_Ea8qeHo}&d7HH53{r!QJPbxM@ica1#ft#_`H=wfac91o!gB8HL46YIamsuT3TMy zfa32J?5Q*ATbk)XEwlLC&DFqdirUv->&u}EXiK&9d|C1eZ~#(k3bI$Auhw6U)5@QP zm-Y&9^Mf1U2KW!ZN!AX%Wk6X~!D!K*>8}M`v|wKVy`yP0u2OszIlEP!3Q<7uW? delta 479 zcmV<50U-X01c?NYG=IQJL_t(o!|j)0PQx$^g`d+5xC4iPJ8@woj==$jMr-q9j%K_R z;vanr2^L9Os1q+~XXCc#vrWfIC3mv0`K$m^uJU|D^Xx$HUrysS}ba3Ldrq z9JHk%B)R^>)(RHL6a=*Qn*k=HW)Gm4JX{?R2C_^O1r`Y_V1I8VXaa;$pjAaOU>0&S zKpU;OIAP<+zbN!N^Xz#m#cE33bnJjT;10N;%m{#|AD;agAXQq~9U^v1cOtIrhRf}i zwOY~u2j^tcC1pkjMvDOt+N`_o$zuZW030jUvKNv-N8pVC5^a&!#au^#K7jNHyZ|^k z0}(Y74B!*Mlz$13q`y!w`85~HhY6jBIcY1Y!i_28O$Y-Rvzez59IM)N2CF%oNg<~| zUb}AxCv+(1>kNM2$dX&`F;CRC;#pW$%0;DVs?p$sO5Tz<$lYynct|k7u z`YFsQ*i&c3wmj2=T1K(CTdILs6t&Y|>&KxAs8h9ce^{~#qyVJU6iiluzFL3vo>cxU zJhfMVyC2*EcffymCRsb=mH~NH1*1iKroTA2Xu-Y!T1V4rT-lw9jNS6PLKKkg`(GD% Vo$SFTy-EN8002ovPDHLkV1kUn)>i-k diff --git a/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationX.png b/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationX.png index 9d5a535813539a211076c9d7409472d90be0bb8d..ff8a5b17448ac86b430245a5284396be6a21c2f2 100644 GIT binary patch delta 571 zcmV-B0>u501mgsdGk*daNklgYYh)B0aTN1EoP=+*~X1_@1)fu#EP+Gxux?~2W0c}^X z6P*+pwEc)bkr@+8H>C!z+I0kT=dMLx{iuDTqBM)>7 z-F-~bF%>%xF3@)e`uZa@Ifc3o)yb$pi#V*PKuh~3{Q;ok#vyE&N3dE^$C``zVmItKrW=|Ybo}PR2lX~ zBmWwQq#fO@;4To^)Y}`IQxN*Ivkb}?AEPXe(dayZ9#Cj%psz9f&I{$Md{e2s5$kVthJT}{38*(5sZ>8$vsyAG z0_w2s=Z#pmYH0lgZ5vuYLEDD+Ja5|$*tePx6X9?;91e$y46m2riKVAErBR-bgjx)| zn$zaOC*6ARE}l2wZAixzHhrrQ{%e$LghdHwl2-JbqDViGt z6U|^FIZ9oJQozYax98&*Z8V}Yq zn6Y+Gv%!^={ViOx87}I!GArDc4VVa~eaA|?kbpH3nPFX=;x`r&&?A!>*Y^KV?YWl8 d;cz$}m%nYnq6D($=kx#o002ovPDHLkV1m-2?IQpH diff --git a/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationXYZ.png b/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationXYZ.png index 1f622ba398a3965e28c09f48e0ab5471241099f3..4db1f6ca86b93fc4069224a1cc5b508423dfd141 100644 GIT binary patch delta 1330 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 UJCLv2A^-pY07*qoM6N<$f>+E-Y5)KL diff --git a/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationY.png b/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationY.png index 7c1bf6da9bc1c04369e37260293f3ec6bf56f74b..bbae6db5abe2fef94a9e7f14e45d4aeb6afcb96e 100644 GIT binary patch delta 860 zcmV-i1Ec)J27(8WGk*g)NklxoC3Djmf~3lXTgd>P659-F+h=^iw>?W#WLM!*5%+L zq(X`Vc4;5$o_`LYt>EC|eWQ&w`kW-71a9YP`1St)*N!Of_Hp`48xODofjh$aY*qp{ zd}?lw3v$4v<$zsU;?j^9eOKV(M+9p`lpne@q)SU)b4B*(ECtm2G#F7O#JFZN_)G9_ zDtNkPxN8Gy4}9$Q5Gx&zhzhv?4MGA;hFBNtRG-9nzkln*zbF{32v$uf-|ykvJ)*7x z%nUB3OiVc+V1!OonZuSU( z{X*$|!GF~`*Any$Y=XuFEmxJJ_i1ED&h$!wbp&`^2=FBxVzdlM7DmZihUp&8vCfle zVEIrk7Id(KMoft@8k1ut%pYr)IG6&BDUqNPQ6a=2z+M6HDi%WwLMlY)B-u35rb*5X zIHr_M;16IXJ~kfB!hkR7;P4(BACmxsFk6VFnSW)HE5+&34>1^G;bY^{-1Bgr7X{qs z@-v66y(aFCjX&pR>ZndK$>m^(!H6mWCP&oqX#NpX`T^7m8?}1nA>RzC-FN8Ut#hPI z0;-H=-Bh_>bwex$*zbI5w?I8w&r42?V)(I#JPI%$*!XRWVFp{8QNwpH(349X^z(E$_ktCqT_)Of m==b?_B?{y=8*Q}FYWf!Sr6##Mx%v=R{;y37&a1mp;C z0(t|=N#F*+9*N$d>{^hJiWCZnRJMto#EzTC0%AFVG((aWgz`(49oh5dn}6nco?`$6 zZ0sAzV{$T((dCm0;Xa!BMn$IG+n{6chf)Baxq)Ehp(gZBJAdFOw#I%7d8W6_1$fHM z-`+HkpB?A}PK&iL;57Hf9ng31PupD?;G~0#f+~P7T%Q_f`nsI%;AE^tATtM-1(dwr2yLvLzm_3{bBH>X!&sAD~`)xN^#tyyvzYu{#q` z`MC5c5o6x9i4KMEp#d+J4A%^Co<`Vi7i-iX2}QI3O=5bK>0-HkO3w%QFBIuR1N;TS z+!Xb+joa){p+`A`8?erRbv?i$2}Kf2Vj^rpoaQE8Lw^YF8E`W1lm=7}JvQAChb~s; zT0)T&Mf#%@xEL^?${OcC$1}hrrc953YQ4r;9a?h%w%DnkQFB8adX&dpJ7+CBv>Yrj z%$g|D%+0S{16p%U?=ibX*qLi7DuWtQU`Ro$%27Tp1~PW!f#KEMfO#O9=tZ{-Qvuaq z8V@OGPk+Jm56nB+APWqCF+ulpLixC3Kq-oZA~7Zr_S}HS>|zsP5>q5Wk&Xe6ptS(c zS<4o1j7g6&Ar5EM76PnshC@i19wu>?h->c^OLu?TVS*!&PsJ((A<#m-5G z%7;z7TMi)>-OSCAql#3|!5EW1C3=+UP{GH2nSY`lfU&@f+BgZ2Muh#$#lK&nLzx~W z`eSZtZ*^TPBJ3cu<{907*qoM6N<$f;Mw?Pyhe` diff --git a/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationZ.png b/golden/compose/ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationZ.png index 535f416925a6fdba678b2bcb5f12f689567c6f4a..04b6da721981fe189833b1d947b3995357bd1b6f 100644 GIT binary patch delta 804 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 diff --git a/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_custom_size.png b/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_custom_size.png index 0f9d06e9af82ed0e2e58611c5a231a845c77f3cf..2d39ac7f76882fc0e2bd2f7722619e53b9108897 100644 GIT binary patch delta 1387 zcmV-x1(f=^3bPE5Gk*o@Nkl$E!h+Ok05C_WXfDMD$@B&PXK~dmF4PX>WmKa3b1&M*Rj~6>& zg>@^7?OO8vTy5=H`{q3R^?BdZo>QsLJcJblU9$j5IN#V{7W?Q^5Q#zmpI!H&y z21)ZOZkeY-VFSAy4@^Kjiq?1t%cl9*_fDzIrZvs-5SDoqt)X0Kt`0Ib_JgEz9>RbZ z3M*^=htB6`%YUqUf`Ih+`t@x!KTe^r%0n2GbS@nW&^!UL!NC!^e=Mn6nauYd$3q@P z&rkWN?d?I*tO@R!r8#ppPZ^9TTJ0eWE0g(F(nd-9ZE$dea-sRwAZB~y?&;5YWwT#< z2q&kQ^7P)<)a!OI;yCYd{H3zlQL40FqIIF>DbjSgU$kOz3FSd+b&zo%)qPa%bPu#> zK+N__8mVJAE-RBcNNLb=0r3zXk+faX&H7FHtbZ(Nd-_~JbFV=>pP#L{b9-dARqlD2 zk-po0Kv%C0*~yb* zlnxCIh)bprUQ9y~WcFxNj@bR0%nnI9pd|UqB&Uq1TR?o%rl*w4^~(JXnJsFm(Ys%k z*?&QejqSH1M}DN7n9)Ug6U$OcFvVhug{E1gcXX^vPi|t74gym31^f14-tn^p*K(K_ z1f<&k?D(5^Tjc&$9T)V!q^H;xElK{QL};0Sq#?;l`c2Y;I*n;W(qon+CCY=DHl3qb z+v*q&Nm`(CnTuVcMFZl#qyBx(-k~&TxqpCo97lCO7i2sji@i|jp*(1<4q~>WaU;v@ zq&#SufTS0S>uliIIz5VBp+snn4wA{dUBgxvBweau9dl9A&;QeN0y7&BkD_N}_Ua^? zoRbukBunMKuZF4GJ|)Q#xo?(qev<9-UMMW5Ola;7lFja_(g{w>eWNAGN=uTWNq;W0 zPb5wD9!5#hrzVxHSWGNQo>sZsE$N#oU4$zuV#ZAUQIim!ko$$ZE+=|QrP6LYeE5qA z|0a%yWR|b;kX5gi=pn3?`!1PPexG4k(vy}XmnavSuYvi+yBEBO8&DBBL+Lo(aUTMW*Pp#pQBpV*SA@`#bbfY8p z^Qm0x?>}Qn(k=H+<#Nj?7n*JjGF|C+ehmEQ#&Wsa`umTu+wtJ6L8j~K)kNcxu2jS3HiduqV)p8gYL40deIK t5Rhsu#QT)V5D=5G1aXtV1U?rH@(&9B$n5WM7AOD!002ovPDHLkV1kwJyrcjC delta 1191 zcmV;Y1X%mC47m!BGk*l|NklDCWCh6% z!VAYSeI8z38w27Z{V_`U z7!lP2#{e5sR_f~1b-T37l=&$#Ps;oEr+2$W-6#LU=JPjqD?&~thf&H=lrmnjkFzqH z8Gq2z3UcG!0|W7K3 zY?@CI@%S0izX8`qj5vZJ+S^0V%WDr-(S;;IW-| z`-Cm1AU94nc4Ui%u?O2T2D$C^)b(YQ^53-{Rp#$yHXCUkwylChl(PPD!6x!=`W zuOg}kJ%6(MtaJC~OTdGO$Te1v%%=G%=JPYtOXz(C$*S6mot=Xi463+0{bMuQSS;GO zzCJ5$`&o0*n}B3pA9PdJ`!dbrBr@AFo1JMkUL_z|*W)PVFfzZs*{M%5KSwETWS;t- zgtZ4Gn`S>U54)S0wry~H8JTUAa$2TS_lxk&4S%|Uaf!^bbw{6BqLiW;*<2SZ;;5@8 z-}UsE|BTEwB2IL%c)daT&7uoclycaUYH=EwZF&E`)oi?aKyJ^=s@jX;u<8cx2OAE> zS(MVoeBQduOD_X*FD#?(W~ZOm`AvF6yo;-=))$3rRX}df;ikEW^7#4j5-u3t0_TNjWGRFA)_h?NxCx(brHxl6vK{G@r2X2k@7-nEZ?m1T2-^^lC#%QJ$^K(^C*UfJExhZt{qfPDs3L4h z1$pR`{5%$mw`DdPmFe^(A|kG?o}LQQZGTgy(~~lrjbgEQ8xJoj^s{E-wX8DLWZ7D~ z=aG5*&}6{}*YdroHV>|~+f}OLxW9tqy|sLyKNVzm_xSF~9hpCr>2&<)OxjY~m%LVH zvrlC@9Y^L5k$JZC7@#i|Shuz$-<0$1&6@Q_B z6=Y{;Kj!l{Wi~r{&dFKY_H*~cJNLU+r_Y&{TiW)r%w|V1pTCKnoqf$k@5Uf6m6J&o zgTaTdo?I;6x}O69`4W<*`5b@WnfPa!PWQa!{JRF}|5HM;UHTXVBqHvv249NR+TkBX zq^>Wst}ne4Y@^+^@8PlUMBx8EAOxHI(H)a<1#}mH_zP}}x8A&gY=Zy*002ovPDHLk FV1hxIXb}Ja diff --git a/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_specified_size.png b/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_specified_size.png index 157a7e53d3da2e787c2990fd5e16200ebd0f8dfe..835d8a11e202fcfce915b3f07e6f0696d055e600 100644 GIT binary patch literal 3086 zcmd5;i#HRF7dKTKB zgG7?-RaY(oiAX!No3w~-NC(~)6WiT~K4I$?JFzsG6b_3%KwITg&?V4IgL$A6;Og5y zGVQy6QO@O{>Z54ND2ijy@V75zCCj@4R=K6Xi7*cq7-7h5UG z3;@lx%1+14QQpoqxb%yPupbcWXz-@>^nct$pClh1GJ%t5&A&moPLRWNRnDvDJt>e! zd)>_1>FF!-yrxT^ad^vy>z|ur)-?`;Y<0qytikrOJn}ZV&eJdm0^OnZMaWFXclP zzl(Bwe+YMp-He{n%$`*#EQ(>gq+V^s3z=bZ@H{FuT4zIf-fe0 zB+O}*j4@Z=PD!uVSW~euPgCe!tFLQ=;me4lR5J;$RDqIQFV?c4_yXSFE?KZu-Fc*V zca6wi^xssQI!{*u7G!Qex(Nb>okNFY{oI(@)oWoWu)9ZEpT2nvH>gV#y3c9wi&2-0 zYd5vBX9a`Xof=}!U=C|cF>Y~4k7(e5u1S+=GHQbo41VO8(>tUs7yLI%UxhUsVHLLq zY+e|`on6(;O3_HkJ}K>>vROBPhF6Vigv#7H+!hGrIqN+T%-$X>HzJk4dly#0THY7G zuxLJt4C5mD1e+2op;IsR6bY|p&#t+hSyb)Yu`E<5K%`t>fb%)Q=yRtRr!78l0eD8*UPAmp)h)gx|hgm@j^GBJrLLfb@66vv0|W zyF(VX;m&ro1hcIha2)3?_t^mF#r4LEyaMgY_2;K=+}Ya3r22V_JDV#v7po5MB_{nd z|AW;@+JlkOB4t}b=#E?CR{r=G0>D*`_80p3zbnnF5!AiWckQGAYBG=Ba;<7$CVZ0a zgM|742Y3~0)C{*^W$=C{zK|%6scB9A=4y%?+AE>sW)5}?@(x@9_b!vdIROjSt??Ml zq-{m*cTzKH;j@Le$Z9URSd#JOh9sF7)jx5LAc3pf-FAm|TG&_7-!i>!mv~ zqZHps3QwA$xnscnewuSbHW@7~LyC3#9zA|6F}15A*SmG%+RsHjWuo@(+YZD2&5tsf zf3Yt6Ny$g;ZFZj}D$}&!<<18+e{XO8g5$U;_;#9tJxM$}-1p&x+Bqp=m@3F)(QzCA zlegis4vc<&J#*6?0erxX zk7lmH!Q(QgV5He~bBh?*)vIGMwSl9y`JTSQTs#btd}nkl$@}XQ$Wf#KQJ^7g>fxB# z$geX-*3O)!io#4n7>ZhdCci+#w=UmB3SF0AeC*h#(Z&P8PVZx*Uxthfo4>7vg^sYuihhSPuWdfbTE48-cS;-S-l%5^+2&`>!RKAPptMK$-wnVwE{CZ<-8(K%qCs% zfY}(*LT%zmu*#+ygWrg>w@*)x;Dtw5>cKz;x0o*FesZCZtC;T62+$-Ika_IUSR=qCqEXX=dkQSsH7dG9VEslx$g;{hdlWl$!hQColZ4%ba z8@0B00NNE_cpDhBH?{=pcM#RQ#au_nitHs_=G9gqiER5L;VMuF}#Wx{MrFJ)tjjG$>@u4bdQARpDNh{-BTa- zmjnNXs>B2MrQ_7^NGt`1W$1ioaxL`bu4miI|LSl zXH_yVQYjf3wczPk5Z`%WsSNjqB^#hX?77*^NhUeRz8?utfQX6mm41yFoadE;F8VZY z1pUSHta$;Ix6D#bF-jf+YIx}rO3A*Rk@T_g9p0Yugt3QBQ@IBTUNDZ6=UD6eZw5VF zde68c_`VQ}uppF>&#w(9cD&o#o*W&`;aNQR{aaCRg$lOGpuoI%k#naoAt8vs&Q;BL z>CF}Cvx4ltRT}k9kZ>uDYZJQ5%0aylaDErGHKa!@F;S;6u38%?`hX-^zJcG`Mm)&z z_NAWBsc9%{&eMfLP1OWSC>AnqNcW9tNK80W>hauM^)vGgoKNjNRnME$;LvW1ABD6f zYP-KHZvAUP#*x4`pZYqf5?5^MQ~yC5+<%bc)A}u@)Mt|Nz&XbLc|?{;lvDLWVgG*{ zgT3L|nbS(Sx75i<#pNEZ3hQSj@=3BxZD(h$>Zixv3je=^&J_YnBG?^4UB{1$9(*yh M{h1SWc7Cb<19sTD+5i9m literal 3089 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 Yyrv1RC6SldJ3heZmYH6e?xWEE0WCixxc~qF diff --git a/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_size.png b/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_size.png index 157a7e53d3da2e787c2990fd5e16200ebd0f8dfe..835d8a11e202fcfce915b3f07e6f0696d055e600 100644 GIT binary patch literal 3086 zcmd5;i#HRF7dKTKB zgG7?-RaY(oiAX!No3w~-NC(~)6WiT~K4I$?JFzsG6b_3%KwITg&?V4IgL$A6;Og5y zGVQy6QO@O{>Z54ND2ijy@V75zCCj@4R=K6Xi7*cq7-7h5UG z3;@lx%1+14QQpoqxb%yPupbcWXz-@>^nct$pClh1GJ%t5&A&moPLRWNRnDvDJt>e! zd)>_1>FF!-yrxT^ad^vy>z|ur)-?`;Y<0qytikrOJn}ZV&eJdm0^OnZMaWFXclP zzl(Bwe+YMp-He{n%$`*#EQ(>gq+V^s3z=bZ@H{FuT4zIf-fe0 zB+O}*j4@Z=PD!uVSW~euPgCe!tFLQ=;me4lR5J;$RDqIQFV?c4_yXSFE?KZu-Fc*V zca6wi^xssQI!{*u7G!Qex(Nb>okNFY{oI(@)oWoWu)9ZEpT2nvH>gV#y3c9wi&2-0 zYd5vBX9a`Xof=}!U=C|cF>Y~4k7(e5u1S+=GHQbo41VO8(>tUs7yLI%UxhUsVHLLq zY+e|`on6(;O3_HkJ}K>>vROBPhF6Vigv#7H+!hGrIqN+T%-$X>HzJk4dly#0THY7G zuxLJt4C5mD1e+2op;IsR6bY|p&#t+hSyb)Yu`E<5K%`t>fb%)Q=yRtRr!78l0eD8*UPAmp)h)gx|hgm@j^GBJrLLfb@66vv0|W zyF(VX;m&ro1hcIha2)3?_t^mF#r4LEyaMgY_2;K=+}Ya3r22V_JDV#v7po5MB_{nd z|AW;@+JlkOB4t}b=#E?CR{r=G0>D*`_80p3zbnnF5!AiWckQGAYBG=Ba;<7$CVZ0a zgM|742Y3~0)C{*^W$=C{zK|%6scB9A=4y%?+AE>sW)5}?@(x@9_b!vdIROjSt??Ml zq-{m*cTzKH;j@Le$Z9URSd#JOh9sF7)jx5LAc3pf-FAm|TG&_7-!i>!mv~ zqZHps3QwA$xnscnewuSbHW@7~LyC3#9zA|6F}15A*SmG%+RsHjWuo@(+YZD2&5tsf zf3Yt6Ny$g;ZFZj}D$}&!<<18+e{XO8g5$U;_;#9tJxM$}-1p&x+Bqp=m@3F)(QzCA zlegis4vc<&J#*6?0erxX zk7lmH!Q(QgV5He~bBh?*)vIGMwSl9y`JTSQTs#btd}nkl$@}XQ$Wf#KQJ^7g>fxB# z$geX-*3O)!io#4n7>ZhdCci+#w=UmB3SF0AeC*h#(Z&P8PVZx*Uxthfo4>7vg^sYuihhSPuWdfbTE48-cS;-S-l%5^+2&`>!RKAPptMK$-wnVwE{CZ<-8(K%qCs% zfY}(*LT%zmu*#+ygWrg>w@*)x;Dtw5>cKz;x0o*FesZCZtC;T62+$-Ika_IUSR=qCqEXX=dkQSsH7dG9VEslx$g;{hdlWl$!hQColZ4%ba z8@0B00NNE_cpDhBH?{=pcM#RQ#au_nitHs_=G9gqiER5L;VMuF}#Wx{MrFJ)tjjG$>@u4bdQARpDNh{-BTa- zmjnNXs>B2MrQ_7^NGt`1W$1ioaxL`bu4miI|LSl zXH_yVQYjf3wczPk5Z`%WsSNjqB^#hX?77*^NhUeRz8?utfQX6mm41yFoadE;F8VZY z1pUSHta$;Ix6D#bF-jf+YIx}rO3A*Rk@T_g9p0Yugt3QBQ@IBTUNDZ6=UD6eZw5VF zde68c_`VQ}uppF>&#w(9cD&o#o*W&`;aNQR{aaCRg$lOGpuoI%k#naoAt8vs&Q;BL z>CF}Cvx4ltRT}k9kZ>uDYZJQ5%0aylaDErGHKa!@F;S;6u38%?`hX-^zJcG`Mm)&z z_NAWBsc9%{&eMfLP1OWSC>AnqNcW9tNK80W>hauM^)vGgoKNjNRnME$;LvW1ABD6f zYP-KHZvAUP#*x4`pZYqf5?5^MQ~yC5+<%bc)A}u@)Mt|Nz&XbLc|?{;lvDLWVgG*{ zgT3L|nbS(Sx75i<#pNEZ3hQSj@=3BxZD(h$>Zixv3je=^&J_YnBG?^4UB{1$9(*yh M{h1SWc7Cb<19sTD+5i9m literal 3089 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 Yyrv1RC6SldJ3heZmYH6e?xWEE0WCixxc~qF diff --git a/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox.png b/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox.png index 157a7e53d3da2e787c2990fd5e16200ebd0f8dfe..835d8a11e202fcfce915b3f07e6f0696d055e600 100644 GIT binary patch literal 3086 zcmd5;i#HRF7dKTKB zgG7?-RaY(oiAX!No3w~-NC(~)6WiT~K4I$?JFzsG6b_3%KwITg&?V4IgL$A6;Og5y zGVQy6QO@O{>Z54ND2ijy@V75zCCj@4R=K6Xi7*cq7-7h5UG z3;@lx%1+14QQpoqxb%yPupbcWXz-@>^nct$pClh1GJ%t5&A&moPLRWNRnDvDJt>e! zd)>_1>FF!-yrxT^ad^vy>z|ur)-?`;Y<0qytikrOJn}ZV&eJdm0^OnZMaWFXclP zzl(Bwe+YMp-He{n%$`*#EQ(>gq+V^s3z=bZ@H{FuT4zIf-fe0 zB+O}*j4@Z=PD!uVSW~euPgCe!tFLQ=;me4lR5J;$RDqIQFV?c4_yXSFE?KZu-Fc*V zca6wi^xssQI!{*u7G!Qex(Nb>okNFY{oI(@)oWoWu)9ZEpT2nvH>gV#y3c9wi&2-0 zYd5vBX9a`Xof=}!U=C|cF>Y~4k7(e5u1S+=GHQbo41VO8(>tUs7yLI%UxhUsVHLLq zY+e|`on6(;O3_HkJ}K>>vROBPhF6Vigv#7H+!hGrIqN+T%-$X>HzJk4dly#0THY7G zuxLJt4C5mD1e+2op;IsR6bY|p&#t+hSyb)Yu`E<5K%`t>fb%)Q=yRtRr!78l0eD8*UPAmp)h)gx|hgm@j^GBJrLLfb@66vv0|W zyF(VX;m&ro1hcIha2)3?_t^mF#r4LEyaMgY_2;K=+}Ya3r22V_JDV#v7po5MB_{nd z|AW;@+JlkOB4t}b=#E?CR{r=G0>D*`_80p3zbnnF5!AiWckQGAYBG=Ba;<7$CVZ0a zgM|742Y3~0)C{*^W$=C{zK|%6scB9A=4y%?+AE>sW)5}?@(x@9_b!vdIROjSt??Ml zq-{m*cTzKH;j@Le$Z9URSd#JOh9sF7)jx5LAc3pf-FAm|TG&_7-!i>!mv~ zqZHps3QwA$xnscnewuSbHW@7~LyC3#9zA|6F}15A*SmG%+RsHjWuo@(+YZD2&5tsf zf3Yt6Ny$g;ZFZj}D$}&!<<18+e{XO8g5$U;_;#9tJxM$}-1p&x+Bqp=m@3F)(QzCA zlegis4vc<&J#*6?0erxX zk7lmH!Q(QgV5He~bBh?*)vIGMwSl9y`JTSQTs#btd}nkl$@}XQ$Wf#KQJ^7g>fxB# z$geX-*3O)!io#4n7>ZhdCci+#w=UmB3SF0AeC*h#(Z&P8PVZx*Uxthfo4>7vg^sYuihhSPuWdfbTE48-cS;-S-l%5^+2&`>!RKAPptMK$-wnVwE{CZ<-8(K%qCs% zfY}(*LT%zmu*#+ygWrg>w@*)x;Dtw5>cKz;x0o*FesZCZtC;T62+$-Ika_IUSR=qCqEXX=dkQSsH7dG9VEslx$g;{hdlWl$!hQColZ4%ba z8@0B00NNE_cpDhBH?{=pcM#RQ#au_nitHs_=G9gqiER5L;VMuF}#Wx{MrFJ)tjjG$>@u4bdQARpDNh{-BTa- zmjnNXs>B2MrQ_7^NGt`1W$1ioaxL`bu4miI|LSl zXH_yVQYjf3wczPk5Z`%WsSNjqB^#hX?77*^NhUeRz8?utfQX6mm41yFoadE;F8VZY z1pUSHta$;Ix6D#bF-jf+YIx}rO3A*Rk@T_g9p0Yugt3QBQ@IBTUNDZ6=UD6eZw5VF zde68c_`VQ}uppF>&#w(9cD&o#o*W&`;aNQR{aaCRg$lOGpuoI%k#naoAt8vs&Q;BL z>CF}Cvx4ltRT}k9kZ>uDYZJQ5%0aylaDErGHKa!@F;S;6u38%?`hX-^zJcG`Mm)&z z_NAWBsc9%{&eMfLP1OWSC>AnqNcW9tNK80W>hauM^)vGgoKNjNRnME$;LvW1ABD6f zYP-KHZvAUP#*x4`pZYqf5?5^MQ~yC5+<%bc)A}u@)Mt|Nz&XbLc|?{;lvDLWVgG*{ zgT3L|nbS(Sx75i<#pNEZ3hQSj@=3BxZD(h$>Zixv3je=^&J_YnBG?^4UB{1$9(*yh M{h1SWc7Cb<19sTD+5i9m literal 3089 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 Yyrv1RC6SldJ3heZmYH6e?xWEE0WCixxc~qF diff --git a/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox_and_fill_bounds.png b/golden/compose/ui/ui-desktop/res/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox_and_fill_bounds.png index 01a21f14f76d05713dff498d30f451c7edc1f893..ba969913bda1eda3f36900ff0d1061902c781b11 100644 GIT binary patch delta 6184 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 69c2d72020864..41c3358777107 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,7 +54,7 @@ moshi = "1.13.0" protobuf = "3.21.8" paparazzi = "1.0.0" paparazziNative = "2022.1.1-canary-f5f9f71" -skiko = "0.8.9" +skiko = "0.8.11" sqldelight = "1.3.0" retrofit = "2.7.2" wire = "4.5.1"