From 7dbda7bb9d6c8cc2715c352d5e1b8528f0b68841 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Wed, 10 Aug 2022 22:44:28 +0800 Subject: [PATCH 01/14] Update Gradle wrapper to 7.5 --- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 ++++++ gradlew.bat | 14 ++++++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 zcmaKS1ymhDwk=#NxVyW%y9U<)A-Dv)xI0|j{UX8L-JRg>5ZnnKAh;%chM6~S-g^K4 z>eZ{yK4;gd>gwvXs=Id8Jk-J}R4pT911;+{Jp9@aiz6!p1Oz9z&_kGLA%J5%3Ih@0 zQ|U}%$)3u|G`jIfPzMVfcWs?jV2BO^*3+q2><~>3j+Z`^Z%=;19VWg0XndJ zwJ~;f4$;t6pBKaWn}UNO-wLCFHBd^1)^v%$P)fJk1PbK5<;Z1K&>k~MUod6d%@Bq9 z>(44uiaK&sdhwTTxFJvC$JDnl;f}*Q-^01T508(8{+!WyquuyB7R!d!J)8Ni0p!cV6$CHsLLy6}7C zYv_$eD;)@L)tLj0GkGpBoa727hs%wH$>EhfuFy{_8Q8@1HI%ZAjlpX$ob{=%g6`Ox zLzM!d^zy`VV1dT9U9(^}YvlTO9Bf8v^wMK37`4wFNFzW?HWDY(U(k6@tp(crHD)X5>8S-# zW1qgdaZa*Sh6i%60e1+hty}34dD%vKgb?QmQiZ=-j+isA4={V_*R$oGN#j|#ia@n6 zuZx4e2Xx?^lUwYFn2&Tmbx0qA3Z8;y+zKoeQu;~k~FZGy!FU_TFxYd!Ck;5QvMx9gj5fI2@BLNp~Ps@ zf@k<&Q2GS5Ia9?_D?v~$I%_CLA4x~eiKIZ>9w^c#r|vB?wXxZ(vXd*vH(Fd%Me8p( z=_0)k=iRh%8i`FYRF>E97uOFTBfajv{IOz(7CU zv0Gd84+o&ciHlVtY)wn6yhZTQQO*4Mvc#dxa>h}82mEKKy7arOqU$enb9sgh#E=Lq zU;_RVm{)30{bw+|056%jMVcZRGEBSJ+JZ@jH#~DvaDQm92^TyUq=bY*+AkEakpK>8 zB{)CkK48&nE5AzTqT;WysOG|!y}5fshxR8Ek(^H6i>|Fd&wu?c&Q@N9ZrJ=?ABHI! z`*z8D`w=~AJ!P-9M=T}f`;76$qZRllB&8#9WgbuO$P7lVqdX1=g*t=7z6!0AQ^ux_ z9rcfUv^t}o_l-ZE+TqvqFsA*~W<^78!k;~!i8(eS+(+@u8FxK+Q7;mHZ<1}|4m<}vh@p`t%|@eM_J(P% zI>M7C)Ir{l|J;$G_EGGEhbP4?6{sYzMqBv+x95N&YWFH6UcE@b}B?q)G*4<4mR@sy1#vPnLMK51tb#ED(8TA1nE zYfhK7bo1!R5WJF$5Y?zG21)6+_(_5oSX9sGIW;(O&S?Rh(nydNQYzKjjJ54aDJ-1F zrJ=np8LsN?%?Rt7f~3aAX!2E{`fh_pb?2(;HOB3W+I*~A>W%iY+v45+^e$cE10fA} zXPvw9=Bd+(;+!rl)pkYj0HGB}+3Z!Mr;zr%gz~c-hFMv8b2VRE2R$8V=_XE zq$3=|Yg05(fmwrJ)QK2ptB4no`Y8Dg_vK2QDc6-6sXRQ5k78-+cPi-fH}vpgs|Ive zE=m*XNVs?EWgiNI!5AcD*3QMW)R`EqT!f0e1%hERO&?AT7HWnSf5@#AR{OGuXG3Zb zCnVWg7h|61lGV3k+>L<#d>)InG>ETn1DbOHCfztqzQ_fBiaUt@q6VMy={Fe-w#~2- z0?*f|z$zgjI9>+JVICObBaK=pU}AEOd@q(8d?j7zQFD@=6t`|KmolTr2MfBI$;EGh zD%W0cA_d#V6Lb$us5yIG(|d>r-QleC4;%hEu5W9hyY zY#+ESY&v`8(&mC~?*|e5WEhC!YU2>m_}`K+q9)a(d$bsS<=YkyZGp}YA%TXw>@abA zS_poVPoN+?<6?DAuCNt&5SHV(hp56PJ})swwVFZFXM->F zc|0c8<$H_OV%DR|y7e+s$12@Ac8SUClPg8_O9sTUjpv%6Jsn5vsZCg>wL+db4c+{+ zsg<#wOuV4jeOq`veckdi-1`dz;gvL)bZeH|D*x=8UwRU5&8W1@l>3$)8WzET0%;1J zM3(X<7tKK&9~kWRI{&FmwY5Gg!b5f4kI_vSm)H1#>l6M+OiReDXC{kPy!`%Ecq-+3yZTk=<` zm)pE6xum5q0Qkd#iny0Q-S}@I0;mDhxf>sX)Oiv)FdsAMnpx%oe8OQ`m%Xeozdzx!C1rQR>m1c_}+J4x)K}k{G zo68;oGG&Ox7w^-m7{g4a7NJu-B|~M;oIH~~#`RyUNm##feZH;E?pf}nshmoiIY52n z%pc%lnU4Q#C=RUz)RU6}E_j4#)jh<&a%JyJj$Fufc#&COaxFHtl}zJUGNLBu3~_@1 zn9F^JO9);Duxo&i@>X(kbYga1i>6p1fca8FzQ0>((Lb-aPUbC*d~a03V$y;*RBY!R ziEJ2IF^FjrvO}0Uy{cMn%u<+P5U!UO>pm9#ZYL5i6|xSC+np7IH$GfXs&uI;y4as@ z&AzJh>(S2?3PKKgab3Z(`xbx(C#46XIvVcW8eG_DjT~}Yz_8PWZ`uf6^Xr=vkvL_` zqmvfgJL+Zc`;iq~iP?%@G7}~fal-zqxa0yNyHBJJ5M)9bI>7S_cg?Ya&p(I)C5Ef4 zZ>YAF6x|U=?ec?g*|f2g5Tw3PgxaM_bi_5Az9MO$;_Byw(2d}2%-|bg4ShdQ;)Z|M z4K|tFv)qx*kKGKoyh!DQY<{n&UmAChq@DJrQP>EY7g1JF(ih*D8wCVWyQ z5Jj^|-NVFSh5T0vd1>hUvPV6?=`90^_)t(L9)XOW7jeP45NyA2lzOn&QAPTl&d#6P zSv%36uaN(9i9WlpcH#}rmiP#=L0q(dfhdxvFVaOwM;pY;KvNQ9wMyUKs6{d}29DZQ z{H3&Sosr6)9Z+C>Q5)iHSW~gGoWGgK-0;k~&dyr-bA3O|3PCNzgC?UKS_B=^i8Ri^ zd_*_qI4B07Cayq|p4{`U_E_P=K`N_~{F|+-+`sCgcNxs`%X!$=(?l2aAW}0M=~COb zf19oe^iuAUuDEf)4tgv<=WRPpK@IjToNNC*#&Ykw!)aqWU4h#|U@(cG_=Qx+&xt~a zvCz~Ds3F71dsjNLkfM%TqdVNu=RNMOzh7?b+%hICbFlOAPphrYy>7D-e7{%o_kPFn z;T!?ilE-LcKM0P(GKMseEeW57Vs`=FF}(y@^pQl;rL3fHs8icmA+!6YJt&8 ztSF?%Un35qkv>drkks&BNTJv~xK?vD;aBkp7eIkDYqn+G0%;sT4FcwAoO+vke{8CO z0d76sgg$CannW5T#q`z~L4id)9BCKRU0A!Z-{HpXr)QJrd9@iJB+l32Ql)Z}*v(St zE)Vp=BB=DDB4Pr}B(UHNe31<@!6d{U?XDoxJ@S)9QM)2L%SA0x^~^fb=bdsBy!uh& zU?M_^kvnt%FZzm+>~bEH{2o?v&Iogs`1t-b+Ml`J!ZPS(46YQJKxWE81O$HE5w;** z|8zM%bp`M7J8)4;%DqH`wVTmM0V@D}xd%tRE3_6>ioMJxyi5Hkb>85muF81&EY!73ei zA3e<#ug||EZJ=1GLXNJ)A z791&ge#lF;GVX6IU?iw0jX^1bYaU?+x{zPlpyX6zijyn*nEdZ$fxxkl!a-~*P3bkf zPd*pzu~3GBYkR_>ET`5UM^>>zTV>5m>)f=az{d0sg6a8VzUtXy$ZS?h#Gk-CA?7)c zI%Vu9DN6XSDQn6;?n9`>l$q&>s?K)R8*OsmI+$L_m z_~E`}w694Z*`Xk3Ne=497Si~=RWRqCM?6=88smrxle#s*W znwhTRsMRmg?37GLJ-)%nDZA7r$YG849j8mJWir1bWBy& zZPneYojSbooC8U@tkO`bWx4%E5*;p#Q^1^S3lsfy7(6A{jL0`A__0vm?>xC%1y8_m z57FfWr^@YG2I1K7MGYuYd>JC}@sT2n^rkrY3w%~$J$Y~HSoOHn?zpR$ zjLj_bq@Yj8kd~DXHh30KVbz@K)0S;hPKm+S&-o%IG+@x@MEcrxW2KFh;z^4dJDZix zGRGe&lQD$p)0JVF4NRgGYuh0bYLy)BCy~sbS3^b3 zHixT<%-Vwbht|25T{3^Hk;qZ^3s!OOgljHs+EIf~C%=_>R5%vQI4mQR9qOXThMXlU zS|oSH>0PjnCakb*js2{ObN`}%HYsT6=%(xA| znpUtG_TJ08kHgm5l@G|t?4E3tG2fq?wNtIp*Vqrb{9@bo^~Rx7+J&OnayrX`LDcF~ zd@0m0ZJ#Z@=T>4kTa5e2FjI&5c(F7S{gnRPoGpu9eIqrtSvnT_tk$8T)r%YwZw!gK zj*k@cG)V&@t+mtDi37#>LhVGTfRA^p%x0d#_P|Mktz3*KOoLIqFm`~KGoDDD4OOxe z?}ag_c08u%vu=5Vx=~uoS8Q;}+R2~?Uh|m-+`-2kDo$d6T!nD*hc#dB(*R{LXV=zo z`PJP0V=O!@3l-bw+d`X6(=@fq=4O#ETa8M^fOvO4qja9o3e8ANc9$sI=A4$zUut~w z4+JryRkI{9qWxU1CCMM$@Aj=6)P+z?vqa=UCv_4XyVNoBD{Xb~Oi4cjjhm8fRD!*U z2)zaS;AI78^Wq+5mDInKiMz|z#K`2emQfNH*U;{9^{NqSMVoq?RSo43<8YpJM^+W$ zxy!A5>5Zl16Vi#?nAYywu3w_=KWnd3*QetocWt`3pK67>)ZVwnT3h zbPdD&MZkD?q=-N`MpCCwpM74L+Tr1aa)zJ)8G;(Pg51@U&5W>aNu9rA`bh{vgfE={ zdJ>aKc|2Ayw_bop+dK?Y5$q--WM*+$9&3Q9BBiwU8L<-`T6E?ZC`mT0b}%HR*LPK} z!MCd_Azd{36?Y_>yN{U1w5yrN8q`z(Vh^RnEF+;4b|2+~lfAvPT!`*{MPiDioiix8 zY*GdCwJ{S(5(HId*I%8XF=pHFz<9tAe;!D5$Z(iN#jzSql4sqX5!7Y?q4_%$lH zz8ehZuyl0K=E&gYhlfFWabnSiGty$>md|PpU1VfaC5~kskDnZX&Yu}?-h;OSav=8u z=e3Yq=mi$4A|sB-J00;1d{Sd1+!v0NtU((Nz2;PFFlC}V{@p&4wGcVhU&nI($RAS! zwXn7)?8~1J3*4+VccRSg5JS<(bBhBM&{ELMD4C_NTpvzboH!{Zr*%HP;{UqxI#g&7 zOAqPSW5Qus$8-xtTvD%h{Tw<2!XR(lU54LZG{)Cah*LZbpJkA=PMawg!O>X@&%+5XiyeIf91n2E*hl$k-Y(3iW*E}Mz-h~H~7S9I1I zR#-j`|Hk?$MqFhE4C@=n!hN*o5+M%NxRqP+aLxDdt=wS6rAu6ECK*;AB%Nyg0uyAv zO^DnbVZZo*|Ef{nsYN>cjZC$OHzR_*g%T#oF zCky9HJS;NCi=7(07tQXq?V8I&OA&kPlJ_dfSRdL2bRUt;tA3yKZRMHMXH&#W@$l%-{vQd7y@~i*^qnj^`Z{)V$6@l&!qP_y zg2oOd!Wit#)2A~w-eqw3*Mbe)U?N|q6sXw~E~&$!!@QYX4b@%;3=>)@Z#K^`8~Aki z+LYKJu~Y$;F5%_0aF9$MsbGS9Bz2~VUG@i@3Fi2q(hG^+Ia44LrfSfqtg$4{%qBDM z_9-O#3V+2~W$dW0G)R7l_R_vw(KSkC--u&%Rs^Io&*?R=`)6BN64>6>)`TxyT_(Rd zUn+aIl1mPa#Jse9B3`!T=|e!pIp$(8ZOe0ao?nS7o?oKlj zypC-fMj1DHIDrh1unUI1vp=-Fln;I9e7Jvs3wj*^_1&W|X} zZSL|S|Bb@CV*YC_-T&2!Ht3b6?)d`tHOP?rA;;t#zaXa0Sc;vGnV0BLIf8f-r{QHh z*Zp`4_ItlOR7{u(K+!p_oLDmaAkNag*l4#29F2b_A*0oz0T|#-&f*;c#<`^)(W@gm z#k9k=t%u8<+C1fNUA{Fh7~wgPrEZZ#(6aBI%6bR4RO(e1(ZocjoDek4#MTgZD>1NG zy9~yoZfWYfwe&S-(zk4o6q6o?2*~DOrJ(%5wSnEJMVOKCzHd z=Yhm+HLzoDl{P*Ybro7@sk1!Ez3`hE+&qr7Rw^2glw^M(b(NS2!F|Q!mi|l~lF94o z!QiV)Q{Z>GO5;l1y!$O)=)got;^)%@v#B!ZEVQy1(BJApHr5%Zh&W|gweD+%Ky%CO ztr45vR*y(@*Dg_Qw5v~PJtm^@Lyh*zRuT6~(K+^HWEF{;R#L$vL2!_ndBxCtUvZ(_ zauI7Qq}ERUWjr&XW9SwMbU>*@p)(cuWXCxRK&?ZoOy>2VESII53iPDP64S1pl{NsC zD;@EGPxs&}$W1;P6BB9THF%xfoLX|4?S;cu@$)9OdFst-!A7T{(LXtdNQSx!*GUSIS_lyI`da8>!y_tpJb3Zuf0O*;2y?HCfH z5QT6@nL|%l3&u4;F!~XG9E%1YwF*Fgs5V&uFsx52*iag(?6O|gYCBY3R{qhxT-Etb zq(E%V=MgQnuDGEKOGsmBj9T0-nmI%zys8NSO>gfJT4bP>tI>|ol@ zDt(&SUKrg%cz>AmqtJKEMUM;f47FEOFc%Bbmh~|*#E zDd!Tl(wa)ZZIFwe^*)4>{T+zuRykc3^-=P1aI%0Mh}*x7%SP6wD{_? zisraq`Las#y-6{`y@CU3Ta$tOl|@>4qXcB;1bb)oH9kD6 zKym@d$ zv&PZSSAV1Gwwzqrc?^_1+-ZGY+3_7~a(L+`-WdcJMo>EWZN3%z4y6JyF4NR^urk`c z?osO|J#V}k_6*9*n2?j+`F{B<%?9cdTQyVNm8D}H~T}?HOCXt%r7#2hz97Gx#X%62hyaLbU z_ZepP0<`<;eABrHrJAc!_m?kmu#7j}{empH@iUIEk^jk}^EFwO)vd7NZB=&uk6JG^ zC>xad8X$h|eCAOX&MaX<$tA1~r|hW?-0{t4PkVygTc`yh39c;&efwY(-#;$W)+4Xb z$XFsdG&;@^X`aynAMxsq)J#KZXX!sI@g~YiJdHI~r z$4mj_?S29sIa4c$z)19JmJ;Uj?>Kq=0XuH#k#};I&-6zZ_&>)j>UR0XetRO!-sjF< zd_6b1A2vfi++?>cf}s{@#BvTD|a%{9si7G}T+8ZnwuA z1k8c%lgE<-7f~H`cqgF;qZ|$>R-xNPA$25N1WI3#n%gj}4Ix}vj|e=x)B^roGQpB) zO+^#nO2 zjzJ9kHI6nI5ni&V_#5> z!?<7Qd9{|xwIf4b0bRc;zb}V4>snRg6*wl$Xz`hRDN8laL5tg&+@Dv>U^IjGQ}*=XBnXWrwTy;2nX?<1rkvOs#u(#qJ=A zBy>W`N!?%@Ay=upXFI}%LS9bjw?$h)7Dry0%d}=v0YcCSXf9nnp0tBKT1eqZ-4LU` zyiXglKRX)gtT0VbX1}w0f2ce8{$WH?BQm@$`ua%YP8G@<$n13D#*(Yd5-bHfI8!on zf5q4CPdgJLl;BqIo#>CIkX)G;rh|bzGuz1N%rr+5seP${mEg$;uQ3jC$;TsR&{IX< z;}7j3LnV+xNn^$F1;QarDf6rNYj7He+VsjJk6R@0MAkcwrsq4?(~`GKy|mgkfkd1msc2>%B!HpZ~HOzj}kl|ZF(IqB=D6ZTVcKe=I7)LlAI=!XU?J*i#9VXeKeaG zwx_l@Z(w`)5Cclw`6kQKlS<;_Knj)^Dh2pL`hQo!=GPOMR0iqEtx12ORLpN(KBOm5 zontAH5X5!9WHS_=tJfbACz@Dnkuw|^7t=l&x8yb2a~q|aqE_W&0M|tI7@ilGXqE)MONI8p67OiQGqKEQWw;LGga=ZM1;{pSw1jJK_y$vhY6 ztFrV7-xf>lbeKH1U)j3R=?w*>(Yh~NNEPVmeQ8n}0x01$-o z2Jyjn+sXhgOz>AzcZ zAbJZ@f}MBS0lLKR=IE{z;Fav%tcb+`Yi*!`HTDPqSCsFr>;yt^^&SI2mhKJ8f*%ji zz%JkZGvOn{JFn;)5jf^21AvO-9nRzsg0&CPz;OEn07`CfT@gK4abFBT$Mu?8fCcscmRkK+ zbAVJZ~#_a z{|(FFX}~8d3;DW8zuY9?r#Dt>!aD>} zlYw>D7y#eDy+PLZ&XKIY&Df0hsLDDi(Yrq8O==d30RchrUw8a=Eex>Dd?)3+k=}Q> z-b85lun-V$I}86Vg#l1S@1%=$2BQD5_waAZKQfJ${3{b2SZ#w1u+jMr{dJMvI|Og= zpQ9D={XK|ggbe04zTUd}iF{`GO1dV%zWK~?sM9OM(= zVK9&y4F^w1WFW{$qi|xQk0F`@HG8oLI5|5$j~ci9xTMT69v5KS-Yym--raU5kn2#C z<~5q^Bf0rTXVhctG2%&MG(cUGaz(gC(rcG~>qgO$W6>!#NOVQJ;pIYe-lLy(S=HgI zPh;lkL$l+FfMHItHnw_^bj8}CKM19t(C_2vSrhX2$K@-gFlH};#C?1;kk&U1L%4S~ zR^h%h+O1WE7DI$~dly?-_C7>(!E`~#REJ~Xa7lyrB$T!`&qYV5QreAa^aKr%toUJR zPWh)J3iD`(P6BI5k$oE$us#%!4$>`iH2p-88?WV0M$-K)JDibvA4 zpef%_*txN$Ei3=Lt(BBxZ&mhl|mUz-z*OD1=r9nfN zc5vOMFWpi>K=!$6f{eb?5Ru4M3o;t9xLpry|C%j~`@$f)OFB5+xo8XM8g&US@UU-sB|dAoc20y(F@=-2Ggp_`SWjEb#>IG^@j zuQK}e^>So#W2%|-)~K!+)wdU#6l>w5wnZt2pRL5Dz#~N`*UyC9tYechBTc2`@(OI# zNvcE*+zZZjU-H`QOITK^tZwOyLo)ZCLk>>Wm+flMsr5X{A<|m`Y281n?8H_2Fkz5}X?i%Rfm5s+n`J zDB&->=U+LtOIJ|jdYXjQWSQZFEs>Rm{`knop4Sq)(}O_@gk{14y51)iOcGQ5J=b#e z2Yx^6^*F^F7q_m-AGFFgx5uqyw6_4w?yKCJKDGGprWyekr;X(!4CnM5_5?KgN=3qCm03 z##6k%kIU5%g!cCL(+aK>`Wd;dZ4h$h_jb7n?nqx5&o9cUJfr%h#m4+Bh)>HodKcDcsXDXwzJ3jR(sSFqWV(OKHC*cV8;;&bH=ZI0YbW3PgIHwTjiWy z?2MXWO2u0RAEEq(zv9e%Rsz|0(OKB?_3*kkXwHxEuazIZ7=JhaNV*P~hv57q55LoebmJpfHXA@yuS{Esg+ z*C}0V-`x^=0nOa@SPUJek>td~tJ{U1T&m)~`FLp*4DF77S^{|0g%|JIqd-=5)p6a` zpJOsEkKT(FPS@t^80V!I-YJbLE@{5KmVXjEq{QbCnir%}3 zB)-J379=wrBNK6rbUL7Mh^tVmQYn-BJJP=n?P&m-7)P#OZjQoK0{5?}XqJScV6>QX zPR>G{xvU_P;q!;S9Y7*07=Z!=wxIUorMQP(m?te~6&Z0PXQ@I=EYhD*XomZ^z;`Os z4>Uh4)Cg2_##mUa>i1Dxi+R~g#!!i{?SMj%9rfaBPlWj_Yk)lCV--e^&3INB>I?lu z9YXCY5(9U`3o?w2Xa5ErMbl5+pDVpu8v+KJzI9{KFk1H?(1`_W>Cu903Hg81vEX32l{nP2vROa1Fi!Wou0+ZX7Rp`g;B$*Ni3MC-vZ`f zFTi7}c+D)!4hz6NH2e%%t_;tkA0nfkmhLtRW%){TpIqD_ev>}#mVc)<$-1GKO_oK8 zy$CF^aV#x7>F4-J;P@tqWKG0|D1+7h+{ZHU5OVjh>#aa8+V;6BQ)8L5k9t`>)>7zr zfIlv77^`Fvm<)_+^z@ac%D&hnlUAFt8!x=jdaUo{)M9Ar;Tz5Dcd_|~Hl6CaRnK3R zYn${wZe8_BZ0l0c%qbP}>($jsNDay>8+JG@F!uV4F;#zGsBP0f$f3HqEHDz_sCr^q z1;1}7KJ9&`AX2Qdav1(nNzz+GPdEk5K3;hGXe{Hq13{)c zZy%fFEEH#nlJoG{f*M^#8yXuW%!9svN8ry-Vi7AOFnN~r&D`%6d#lvMXBgZkX^vFj z;tkent^62jUr$Cc^@y31Lka6hS>F?1tE8JW$iXO*n9CQMk}D*At3U(-W1E~z>tG?> z5f`5R5LbrhRNR8kv&5d9SL7ke2a*Xr)Qp#75 z6?-p035n2<7hK;sb>t9GAwG4{9v~iEIG>}7B5zcCgZhu$M0-z8?eUO^E?g)md^XT_ z2^~-u$yak>LBy(=*GsTj6p<>b5PO&un@5hGCxpBQlOB3DpsItKZRC*oXq-r{u}Wb; z&ko>#fbnl2Z;o@KqS-d6DTeCG?m1 z&E>p}SEc*)SD&QjZbs!Csjx~0+$@ekuzV_wAalnQvX3a^n~3ui)|rDO+9HW|JPEeBGP4 z)?zcZ<8qv47`EWA*_X~H^vr(lP|f%=%cWFM;u)OFHruKT<~?>5Y8l?56>&;=WdZU# zZEK4-C8s-3zPMA^&y~e*9z)!ZJghr3N^pJa2A$??Xqx-BR*TytGYor&l8Q+^^r%Yq02xay^f#;;wO6K7G!v>wRd6531WnDI~h$PN( z+4#08uX?r&zVKsQ;?5eBX=FxsXaGyH4Gth4a&L|{8LnNCHFr1M{KjJ!BfBS_aiy-E zxtmNcXq3}WTwQ7Dq-9YS5o758sT(5b`Sg-NcH>M9OH1oW6&sZ@|GYk|cJI`vm zO<$~q!3_$&GfWetudRc*mp8)M)q7DEY-#@8w=ItkApfq3sa)*GRqofuL7)dafznKf zLuembr#8gm*lIqKH)KMxSDqbik*B(1bFt%3Vv|ypehXLCa&wc7#u!cJNlUfWs8iQ` z$66(F=1fkxwg745-8_eqV>nWGY3DjB9gE23$R5g&w|C{|xvT@7j*@aZNB199scGchI7pINb5iyqYn)O=yJJX)Ca3&Ca+{n<=1w|(|f0)h<9gs$pVSV<<9Og-V z8ki@nKwE)x)^wmHBMk?mpMT=g{S#^8W|>&rI#Ceh;9za}io0k@0JxiCqi-jHlxbt3 zjJA?RihhRvhk6%G5-D{ePh1jare*fQS<328P-DcVAxPTrw=n6k?C6EV75f}cnBRPT zMYDqqKu(ND&aOtc!QRV`vzJSVxx8i~WB#5Ml{b#eQqNnSi7l-bS-`ITW<^zyYQA(b zbj4SuRK>q9o`_v%+C=S?h>2e4!66Ij(P5{7Uz$3u6YJJC$W%EoBa{-(=tQ|y1vov%ZkXVOV z##_UVg4V^4ne#4~<-1DkJqkKqgT+E_=&4Ue&eQ-JC+gi?7G@d6= zximz{zE)WW{b@QCJ!7l&N5x=dXS?$5RBU-VvN4Uec-GHK&jPa&P2z+qDdLhIB+HU) zu0CW&uLvE^4I5xtK-$+oe|58)7m6*PO%Xt<+-XEA%jG_BEachkF3e@pn?tl!`8lOF zbi2QOuNXX)YT*MCYflILO{VZ*9GiC%R4FO20zMK?p+&aCMm2oeMK7(aW=UDzr=AO0 z$5mJ%=qRsR8rZ>_YsL+vi{3*J_9Kzq(;ZwRj+4_f0-*wbkSMPWahX#Fj_a8BnrhJ6 zo^ZZ?Vah1@&6#r=JkuaYDBdp;J3@ii+CHM&@9*er&#P}$@wI$bfrH)&c!*|nkvhf%^*Y6b%dKz%QBSIo@U z{?V^qEs4`q<8@n+u8YiB^sc@6g>TncG<|GsmC3egwE6aO=EwLr~3-2 zNr`+)`i+-83?|1Xy0^8ps&pb}YT?w1eWVnC9Ps1=KM;Rw)bH6O!7Did1NwpnqVPZc z*%Qo~qkDL>@^<^fmIBtx$WUWQiNtAB2x-LO^BB=|w~-zTnJNEdm1Ou(?8PF&U88X@ z#8rdaTd||)dG^uJw~N_-%!XNbuAyh4`>Shea=pSj0TqP+w4!`nxsmVSv02kb`DBr% zyX=e>5IJ3JYPtdbCHvKMdhXUO_*E9jc_?se7%VJF#&ZaBD;7+eFN3x+hER7!u&`Wz z7zMvBPR4y`*$a250KYjFhAKS%*XG&c;R-kS0wNY1=836wL6q02mqx;IPcH(6ThA@2 zXKQF|9H>6AW$KUF#^A%l6y5{fel77_+cR_zZ0(7=6bmNXABv}R!B-{(E^O6Y?ZS)n zs1QEmh_Fm7p}oRyT3zxUNr4UV8NGs+2b8|4shO$OGFj3D&7_e?#yDi=TTe%$2QbG5 zk<;q7aQ;p!M-Osm{vFdmXZ@!z9uWh!;*%>(vTRggufuUGP9Hols@vhx z73pn$3u2;vzRvnXuT&$Os7J@6y12*j!{ix%3B4YU1466ItmJs0NsU(4ZYRYh7wEA6q{b*Hs6@k~ zi7Yq@Ax!et0cUMTvk7P%ym){MHpcliHEI~e3HP0NV=}7;xFv#IC?a<=`>~j_sk{e> z7vg-tK*p83HZ0=QK@ zRIHo^r{D8&Ms-^WZp+6US_Quqjh$Q66W^1}=Uz&XJ8AQE9&2}P zY|FXZzZ|0IiaBd2qdt6dIjQr(ZMIOU%NG1F&fu6Po9m^?BvLhI6T0R!H2d8;U(&p2 zYA|MFscMqcO(ye~Jp?F;0>Ke+5hzVr?aBNe>GsGgr$XrpS9uajN2kNQ3o$V5rp0T( z0$6TJC;3)26SNG#XcX7l^MKTn$ga?6r4Jzfb%ZgA(Zbwit0$kY=avSnI$@Gk%+^pu zS5mHrcRS8LFPC*uVWH4DDD1pY$H8N>X?KIJZuZ2SvTqc5Nr0GHdD8TCJcd$zIhOdC zZX0ErnsozQh;t^==4zTfrZO421AL?)O)l#GSxU#|LTTg4#&yeK=^w#;q63!Nv~1(@ zs^-RNRuF&qgcr+bIzc@7$h9L;_yjdifE*$j0Q&Np=1AuHL--zdkv@}`1 zo~LlDl_YAq*z?vmr4M`GjDkl9?p|-tl(DtX76oZv25_DtZutLS9Ez!5~p?th@4 zyc_uax4W#<(#)LMkvo)yp|5tKsC2=p#6PyhpH|449T<9Zdk|%CAb5cw?fhvQtBO&7 zpQ9$24yLqPHP;$N&fe2wm%8qdctwIna<3SwGtQA3{C77s%CW%LYxtK(SBGustL0<( zu~U9r0UOkr(c{OJxZS0Ntu3+cJlF7R`7k-Bsa&q?9Ae5{{|o~?cM+T7{lB1^#vT8R z?>c9fNWey`1dKDY%F3d2O*8^qYhjlB8*7HMKE<*=(A`{>=1%s1}Pm&#_t1xy!FkPk@%SMEka2@*= zxDuM|vJJ5s+xgDls{>*o!7eOcs|xuVBPWX&+y5vEiADK%hi`#Dbd>;;Pbk2H4*-X&R?_-6ZEutSd8hC+sSjhIo z;D(j4P;2EVpEj#UF7IjM6PC+X$C5T&=nL`*!*hm9U)#O?>wqOgC>jXKN3Slk_yaQX zLf|4D8T4k|wHW`;#ZQVocNF|3izi0sOqXzi7@KlYC3CXBG`94wD;tMI1bj|8Vm zY}9`VI9!plSfhAal$M_HlaYOVNU?9Z#0<$o?lXXbX3O(l_?f)i3_~r+GcO-x#+x^X zfsZl0>Rj2iP1rsT;+b;Mr? z4Vu&O)Q5ru4j;qaSP5gA{az@XTS1NpT0d9Xhl_FkkRpcEGA0(QQ~YMh#&zwDUkNzm z6cgkdgl9W{iL6ArJ1TQHqnQ^SQ1WGu?FT|93$Ba}mPCH~!$3}0Y0g zcoG%bdTd$bmBx9Y<`Jc+=Cp4}c@EUfjiz;Rcz101p z=?#i$wo>gBE9|szaZMt-d4nUIhBnYRuBVyx+p?5#aZQgUe(!ah`J#l1$%bl5avL27 zU2~@V`3Ic&!?FhDX@Cw!R4%xtWark#p8DLT)HCZ?VJxf^yr@AD*!ERK3#L$E^*Yr? zzN&uF9Roh4rP+r`Z#7U$tzl6>k!b~HgM$C<_crP=vC>6=q{j?(I}!9>g3rJU(&){o z`R^E*9%+kEa8H_fkD9VT7(Fks&Y-RcHaUJYf-|B+eMXMaRM;{FKRiTB>1(=Iij4k1(X__|WqAd-~t#2@UQ}Z&<1Th0azdXfoll!dd)6>1miA z!&=6sDJm=e$?L&06+Q3`D-HNSkK-3$3DdZMX-6Xjn;wd#9A{~ur!2NcX>(qY_oZL0~H7dnQ9sgLe!W>~2|RSW7|hWn<({Pg*xF$%B-!rKe^_R_vc z(LO!0agxxP;FWPV({8#lEv$&&GVakGus=@!3YVG`y^AO1m{2%Np;>HNA1e{=?ra1C}H zAwT0sbwG|!am;fl?*_t^^#yLDXZ*Nx)_FqueZi0c-G~omtpHW0Cu)mEJ`Z1X8brq$ z%vK##b~o*^b&Hz!hgrD=^6P8}aW40lhzMLB5T5*v`1QH?+L~-@CDi3+C@nRf2{7UE zyDIe{@LKw`Eu=Z%6<<_=#V|yxJIKiq_N?ZJ_v0$c)N4l07ZV_mIXG}glfBSPivOhw z-~+9GdckSpMBNR9eR`Y|9_)sXS+u_OiQ%!9rE(2AFjoxN8lk16Sb~^Sq6kRoEp3yD(mm`HsYIXcag_EAB8MHc}nahxVVUTts~U9P|f;7Ul$_` zStR4v&P4q_$KXOEni$lkxy8=9w8G&47VY0oDb^+jT+>ARe3NHUg~St`$RDxY)?;_F znqTujR&chZd2qHF7y8D$4&E3+e@J~!X3&BW4BF(Ebp#TEjrd+9SU!)j;qH+ZkL@AW z?J6Mj}v0_+D zH0qlbzCkHf|EZ`6c>5ig5NAFF%|La%M-}g(7&}Vx8K)qg30YD;H!S!??{;YivzrH0 z(M%2*b_S-)yh&Aiqai)GF^c!<1Xemj|13>dZ_M#)41SrP;OEMaRJ)bCeX*ZT7W`4Y zQ|8L@NHpD@Tf(5>1U(s5iW~Zdf7$@pAL`a3X@YUv1J>q-uJ_(Dy5nYTCUHC}1(dlI zt;5>DLcHh&jbysqt?G01MhXI3!8wgf){Hv}=0N|L$t8M#L7d6WscO8Om2|NBz2Ga^ zs86y%x$H18)~akOWD7@em7)ldlWgb?_sRN>-EcYQO_}aX@+b$dR{146>{kXWP4$nN{V0_+|3{Lt|8uX_fhKh~i{(x%cj*PU$i{PO(5$uA? zQzO>a6oPj-TUk&{zq?JD2MNb6Mf~V3g$ra+PB;ujLJ2JM(a7N*b`y{MX--!fAd}5C zF$D_b8S;+Np(!cW)(hnv5b@@|EMt*RLKF*wy>ykFhEhlPN~n_Bj>LT9B^_yj>z#fx z3JuE4H&?Cc!;G@}E*3k`HK#8ag`yE3Z1)5JUlSua%qkF zkTu|<9{w9OSi$qr)WD#7EzITnch=xnR63E*d~WGvi*Co9BBE?ETHud;!Z)7&wz+l6 zuKODYG1>I1U#a%&(GNJ`AqRfg=H!BtSl+_;CEeufF-#+*2EMMz-22@>18=8PH{PHd z);mN=aR0MPF>eutLiS#-AOX>#2%+pTGEOj!j4L(m0~&xR=0+g#HNpno6@veLhJp}e zyNVC$a>4;!9&iGvU_dj&xbKt@^t6r%f^)+}eV^suRTLP52+BVs0kOLwg6n`=NUv50E7My8XQUh?y%mW62OT1pMrKI3Q(r`7vU&@93=G~A?b(^pvC-8x=bSk zZ60BQR96WB1Z@9Df(M1IQh+YrU8sEjB=Tc2;(zBn-pete*icZE|M&Uc+oHg`|1o`g zH~m+k=D$o);{Rs)b<9Zo|9_Z6L6QHLNki(N>Dw^^i1LITprZeeqIaT#+)fw)PlllU zldphHC)t!0Gf(i9zgVm>`*TbmITF zH1FZ4{wrjRCx{t^26VK_2srZuWuY*EMAsMrJYFFCH35Ky7bq8<0K|ey2wHnrFMZyr z&^yEgX{{3i@&iE5>xKZ{Ads36G3a!i50D!C4?^~cLB<<|fc1!XN(HJRM)H^21sEs%vv+Mu0h*HkLHaEffMwc0n6)JhNXY#M5w@iO@dfXY z0c6dM2a4Hd1SA*#qYj@jK}uVgAZdaBj8t6uuhUNe>)ne9vfd#C6qLV9+@Q7{MnF#0 zJ7fd-ivG_~u3bVvOzpcw1u~ZSp8-kl(sunnX>L~*K-ByWDM2E8>;Si6kn^58AZQxI xVa^It*?521mj4+UJO?7%w*+`EfEcU=@KhDx-s^WzP+ae~{CgHDE&XryzW}Nww%-5% diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92f06b5..2ec77e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..f127cfd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From 8a7b4d60a1a76967383dd51643bc6a540bfca3e0 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 12 Aug 2022 21:32:04 +0800 Subject: [PATCH 02/14] Update the Gradle wrapper to 7.5.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ec77e5..8fad3f5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From a8632cddfc53fbda38a369cb7510043492afd5ea Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Nov 2022 18:29:36 +0800 Subject: [PATCH 03/14] Bump Compose to 1.2.1, Kotlin to 1.7.20, and the Gradle publish plugin to 1.1.0 --- buildSrc/src/main/kotlin/Versions.kt | 4 +- gradle-plugins/build.gradle.kts | 4 +- kotlin-js-store/yarn.lock | 264 ++++++++++----------------- lib/build.gradle.kts | 2 +- settings.gradle.kts | 2 +- 5 files changed, 103 insertions(+), 173 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 44d5e4e..84651dc 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,8 @@ -const val projectVersion = "0.1.0-compose-1.2.0-alpha01-dev750-SNAPSHOT" +const val projectVersion = "0.1.1-SNAPSHOT" object DependencyVersions { + val composeJb = "1.2.1" + val webcomponents = "2.6.0" val mwc = "0.25.3" diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index f0d7373..e95e587 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -3,7 +3,7 @@ import com.huanshankeji.generateKotlinSources plugins { `kotlin-dsl` - id("com.gradle.plugin-publish") version "1.0.0-rc-2" + id("com.gradle.plugin-publish") version "1.1.0" } repositories { @@ -11,7 +11,7 @@ repositories { } dependencies { - implementation(kotlin("gradle-plugin", "1.7.0")) + implementation(kotlin("gradle-plugin", "1.7.20")) } diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 74ea056..98a14b2 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== + "@discoveryjs/json-ext@^0.5.0": version "0.5.7" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" @@ -633,10 +638,10 @@ "@material/theme" "14.0.0-canary.261f2db59.0" tslib "^2.1.0" -"@types/component-emitter@^1.2.10": - version "1.2.11" - resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506" - integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ== +"@socket.io/component-emitter@~3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" + integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== "@types/cookie@^0.4.1": version "0.4.1" @@ -815,19 +820,19 @@ resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.6.0.tgz#7d1674c40bddf0c6dd974c44ffd34512fe7274ff" integrity sha512-Moog+Smx3ORTbWwuPqoclr+uvfLnciVd6wdCaVscHPrxbmQ/IJKm3wbB7hpzJtXWjAq2l/6QMlO85aZiOdtv5Q== -"@webpack-cli/configtest@^1.1.1": +"@webpack-cli/configtest@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== -"@webpack-cli/info@^1.4.1": +"@webpack-cli/info@^1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.1": +"@webpack-cli/serve@^1.7.0": version "1.7.0" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== @@ -842,7 +847,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.5: +abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== @@ -951,6 +956,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -1065,11 +1077,6 @@ colorette@^2.0.14: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== -colors@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -1080,11 +1087,6 @@ commander@^7.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -component-emitter@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -1149,14 +1151,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - -debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@4.3.4, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1247,7 +1242,7 @@ engine.io@~6.2.0: engine.io-parser "~5.0.3" ws "~8.2.3" -enhanced-resolve@^5.8.3: +enhanced-resolve@^5.9.3: version "5.10.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== @@ -1320,21 +1315,6 @@ events@^3.2.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - extend@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -1449,11 +1429,6 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -1500,11 +1475,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -1547,11 +1517,6 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -1640,11 +1605,6 @@ is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" @@ -1681,10 +1641,10 @@ js-yaml@4.1.0: dependencies: argparse "^2.0.1" -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== json-schema-traverse@^0.4.1: version "0.4.1" @@ -1700,10 +1660,10 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -karma-chrome-launcher@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738" - integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg== +karma-chrome-launcher@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz#baca9cc071b1562a1db241827257bfe5cab597ea" + integrity sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ== dependencies: which "^1.2.1" @@ -1730,15 +1690,15 @@ karma-webpack@5.0.0: minimatch "^3.0.4" webpack-merge "^4.1.5" -karma@6.3.16: - version "6.3.16" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.16.tgz#76d1a705fd1cf864ee5ed85270b572641e0958ef" - integrity sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ== +karma@6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508" + integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w== dependencies: + "@colors/colors" "1.5.0" body-parser "^1.19.0" braces "^3.0.2" chokidar "^3.5.1" - colors "1.4.0" connect "^3.7.0" di "^0.0.1" dom-serialize "^2.2.1" @@ -1754,7 +1714,7 @@ karma@6.3.16: qjobs "^1.2.0" range-parser "^1.2.1" rimraf "^3.0.2" - socket.io "^4.2.0" + socket.io "^4.4.1" source-map "^0.6.1" tmp "^0.2.1" ua-parser-js "^0.7.30" @@ -1864,17 +1824,12 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" @@ -1895,32 +1850,30 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@9.2.1: - version "9.2.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.1.tgz#a1abb675aa9a8490798503af57e8782a78f1338e" - integrity sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ== +mocha@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" + integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" browser-stdout "1.3.1" chokidar "3.5.3" - debug "4.3.3" + debug "4.3.4" diff "5.0.0" escape-string-regexp "4.0.0" find-up "5.0.0" glob "7.2.0" - growl "1.10.5" he "1.2.0" js-yaml "4.1.0" log-symbols "4.1.0" - minimatch "3.0.4" + minimatch "5.0.1" ms "2.1.3" - nanoid "3.2.0" + nanoid "3.3.3" serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" - which "2.0.2" - workerpool "6.2.0" + workerpool "6.2.1" yargs "16.2.0" yargs-parser "20.2.4" yargs-unparser "2.0.0" @@ -1940,10 +1893,10 @@ ms@2.1.3: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanoid@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== +nanoid@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== negotiator@0.6.3: version "0.6.3" @@ -1965,13 +1918,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - object-assign@^4: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -2003,13 +1949,6 @@ once@^1.3.0: dependencies: wrappy "1" -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -2058,7 +1997,7 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== @@ -2240,50 +2179,44 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - socket.io-adapter@~2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== -socket.io-parser@~4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df" - integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig== +socket.io-parser@~4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" + integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== dependencies: - "@types/component-emitter" "^1.2.10" - component-emitter "~1.3.0" + "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io@^4.2.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.1.tgz#aa7e73f8a6ce20ee3c54b2446d321bbb6b1a9029" - integrity sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ== +socket.io@^4.4.1: + version "4.5.3" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.3.tgz#44dffea48d7f5aa41df4a66377c386b953bc521c" + integrity sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg== dependencies: accepts "~1.3.4" base64id "~2.0.0" debug "~4.3.2" engine.io "~6.2.0" socket.io-adapter "~2.4.0" - socket.io-parser "~4.0.4" + socket.io-parser "~4.2.0" -source-map-js@^1.0.1: +source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-loader@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d" - integrity sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA== +source-map-loader@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.0.tgz#bdc6b118bc6c87ee4d8d851f2d4efcc5abdb2ef5" + integrity sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw== dependencies: - abab "^2.0.5" + abab "^2.0.6" iconv-lite "^0.6.3" - source-map-js "^1.0.1" + source-map-js "^1.0.2" source-map-support@~0.5.20: version "0.5.21" @@ -2340,11 +2273,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - strip-json-comments@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -2489,18 +2417,18 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webpack-cli@4.9.2: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== +webpack-cli@4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" + integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" colorette "^2.0.14" commander "^7.0.0" - execa "^5.0.0" + cross-spawn "^7.0.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^2.2.0" @@ -2527,10 +2455,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.69.1: - version "5.69.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.1.tgz#8cfd92c192c6a52c99ab00529b5a0d33aa848dc5" - integrity sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A== +webpack@5.73.0: + version "5.73.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38" + integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" @@ -2541,13 +2469,13 @@ webpack@5.69.1: acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.3" + enhanced-resolve "^5.9.3" es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" + json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" @@ -2566,13 +2494,6 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -which@2.0.2, which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - which@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2580,15 +2501,22 @@ which@^1.2.1: dependencies: isexe "^2.0.0" +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + wildcard@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -workerpool@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" - integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== +workerpool@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" + integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== wrap-ansi@^7.0.0: version "7.0.0" diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 03962ea..fef2529 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions") - id("org.jetbrains.compose") version "1.2.0-alpha01-dev750" + id("org.jetbrains.compose") version DependencyVersions.composeJb id("com.huanshankeji.sonatype-ossrh-publish") } diff --git a/settings.gradle.kts b/settings.gradle.kts index efc7ce1..319cfd6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ buildscript { //maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } dependencies { - classpath(kotlin("gradle-plugin", "1.7.0")) + classpath(kotlin("gradle-plugin", "1.7.20")) classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.1.8-kotlin-1.6.10") } } From 26c5f67c4877ab46d95fde0a8ad29685223ae0da Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Nov 2022 21:45:27 +0800 Subject: [PATCH 04/14] Bump "com.huanshankeji:kotlin-common-gradle-plugins" to 0.3.2 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 319cfd6..a5bca4b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,6 +12,6 @@ buildscript { } dependencies { classpath(kotlin("gradle-plugin", "1.7.20")) - classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.1.8-kotlin-1.6.10") + classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.3.2") } } From 81ba43fc2f7062e5721f798ce8b76fd2228e005c Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Nov 2022 22:51:20 +0800 Subject: [PATCH 05/14] Add a ":compose-web-common" subproject for code not related to Material Design --- buildSrc/build.gradle.kts | 10 ++- buildSrc/src/main/kotlin/Versions.kt | 2 - .../main/kotlin/lib-conventions.gradle.kts | 26 ++++++ compose-web-common/build.gradle.kts | 23 ++++++ compose-web-material/build.gradle.kts | 45 +++++++++++ .../com/huanshankeji/compose/web/Layouts.kt | 0 .../huanshankeji/compose/web/LoadingState.kt | 0 .../com/huanshankeji/compose/web/Types.kt | 0 .../compose/web/attributes/AttrsScope.kt | 0 .../com/huanshankeji/compose/web/css/CSS.kt | 0 .../compose/web/dom/ElementScope.kt | 0 .../compose/web/material/Components.kt | 0 .../compose/web/material/Layouts.kt | 0 .../compose/web/material/MwcRequires.kt | 0 .../compose/web/material/Styles.kt | 0 .../com/huanshankeji/material/Colors.kt | 0 lib/build.gradle.kts | 79 ------------------- settings.gradle.kts | 17 +--- 18 files changed, 106 insertions(+), 96 deletions(-) create mode 100644 buildSrc/src/main/kotlin/lib-conventions.gradle.kts create mode 100644 compose-web-common/build.gradle.kts create mode 100644 compose-web-material/build.gradle.kts rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Components.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/material/MwcRequires.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Styles.kt (100%) rename {lib => compose-web-material}/src/jsMain/kotlin/com/huanshankeji/material/Colors.kt (100%) delete mode 100644 lib/build.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index cc02e63..982ea2f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,15 @@ plugins { `kotlin-dsl` } - repositories { + //mavenLocal() gradlePluginPortal() + //maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") +} + +dependencies { + implementation(kotlin("gradle-plugin", "1.7.20")) + implementation("org.jetbrains.compose:compose-gradle-plugin:1.2.1") + implementation("com.huanshankeji:kotlin-common-gradle-plugins:0.3.2") + implementation("com.huanshankeji.team:gradle-plugins:0.3.2") } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 84651dc..c96c302 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,8 +1,6 @@ const val projectVersion = "0.1.1-SNAPSHOT" object DependencyVersions { - val composeJb = "1.2.1" - val webcomponents = "2.6.0" val mwc = "0.25.3" diff --git a/buildSrc/src/main/kotlin/lib-conventions.gradle.kts b/buildSrc/src/main/kotlin/lib-conventions.gradle.kts new file mode 100644 index 0000000..f7efc50 --- /dev/null +++ b/buildSrc/src/main/kotlin/lib-conventions.gradle.kts @@ -0,0 +1,26 @@ +import com.huanshankeji.team.`Shreck Ye` +import com.huanshankeji.team.pomForTeamDefaultOpenSource +import org.gradle.api.publish.maven.MavenPublication +import org.gradle.api.tasks.bundling.Jar +import org.gradle.kotlin.dsl.* + +plugins { + id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions") + id("org.jetbrains.compose") + id("com.huanshankeji.sonatype-ossrh-publish") +} + +repositories { + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") +} + +group = "com.huanshankeji" +version = projectVersion + +val javadocJar by tasks.registering(Jar::class) { + archiveClassifier.set("javadoc") +} + +publishing.publications.withType { + artifact(javadocJar) +} diff --git a/compose-web-common/build.gradle.kts b/compose-web-common/build.gradle.kts new file mode 100644 index 0000000..e291cfd --- /dev/null +++ b/compose-web-common/build.gradle.kts @@ -0,0 +1,23 @@ +import com.huanshankeji.team.`Shreck Ye` +import com.huanshankeji.team.pomForTeamDefaultOpenSource + +plugins { + `lib-conventions` +} + +kotlin { + sourceSets { + val jsMain by getting { + dependencies { + implementation(compose.web.core) + implementation(compose.runtime) + } + } + } +} + +publishing.publications.withType { + pomForTeamDefaultOpenSource(project, "Huanshankeji Compose for Web common", "Huanshankeji's common code for Compose for Web") { + `Shreck Ye`() + } +} diff --git a/compose-web-material/build.gradle.kts b/compose-web-material/build.gradle.kts new file mode 100644 index 0000000..602282c --- /dev/null +++ b/compose-web-material/build.gradle.kts @@ -0,0 +1,45 @@ +import com.huanshankeji.team.`Shreck Ye` +import com.huanshankeji.team.pomForTeamDefaultOpenSource + +plugins { + `lib-conventions` +} + +kotlin { + sourceSets { + val jsMain by getting { + dependencies { + implementation(compose.web.core) + implementation(compose.runtime) + implementation(project(":compose-web-common")) + + implementation(npm("@webcomponents/webcomponentsjs", DependencyVersions.webcomponents)) + + fun mwcImplementation(module: String) = + implementation(npm("@material/mwc-$module", DependencyVersions.mwc)) + + fun mwcImplementations(vararg modules: String) { + for (module in modules) mwcImplementation(module) + } + + mwcImplementations( + "button", + "textfield", + "select", + "icon-button", + "snackbar", + "circular-progress", + "circular-progress-four-color" + ) + + implementation(npm("@material/card", DependencyVersions.mdc)) + } + } + } +} + +publishing.publications.withType { + pomForTeamDefaultOpenSource(project, "Compose for Web Material", "Some Material components for Compose for Web") { + `Shreck Ye`() + } +} diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Components.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Components.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Components.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Components.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/MwcRequires.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/MwcRequires.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/MwcRequires.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/MwcRequires.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Styles.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Styles.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Styles.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Styles.kt diff --git a/lib/src/jsMain/kotlin/com/huanshankeji/material/Colors.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/material/Colors.kt similarity index 100% rename from lib/src/jsMain/kotlin/com/huanshankeji/material/Colors.kt rename to compose-web-material/src/jsMain/kotlin/com/huanshankeji/material/Colors.kt diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts deleted file mode 100644 index fef2529..0000000 --- a/lib/build.gradle.kts +++ /dev/null @@ -1,79 +0,0 @@ -plugins { - id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions") - id("org.jetbrains.compose") version DependencyVersions.composeJb - id("com.huanshankeji.sonatype-ossrh-publish") -} - -repositories { - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") -} - -kotlin { - sourceSets { - val jsMain by getting { - dependencies { - implementation(compose.web.core) - implementation(compose.runtime) - - implementation(npm("@webcomponents/webcomponentsjs", DependencyVersions.webcomponents)) - - fun mwcImplementation(module: String) = - implementation(npm("@material/mwc-$module", DependencyVersions.mwc)) - - fun mwcImplementations(vararg modules: String) { - for (module in modules) mwcImplementation(module) - } - - mwcImplementations( - "button", - "textfield", - "select", - "icon-button", - "snackbar", - "circular-progress", - "circular-progress-four-color" - ) - - implementation(npm("@material/card", DependencyVersions.mdc)) - } - } - } -} - -//group = "com.huanshankeji" -version = projectVersion - -val javadocJar by tasks.registering(Jar::class) { - archiveClassifier.set("javadoc") -} - -publishing.publications.withType { - artifact(javadocJar) - - pom { - name.set("Compose for Web Material") - description.set("Some Material components for Compose for Web") - val githubUrl = "https://github.com/huanshankeji/compose-web-material" - url.set(githubUrl) - - licenses { - license { - name.set("The Apache License, Version 2.0") - url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") - } - } - developers { - developer { - id.set("ShreckYe") - name.set("Shreck Ye") - email.set("ShreckYe@gmail.com") - } - } - scm { - val scmString = "scm:git:$githubUrl.git" - connection.set(scmString) - developerConnection.set(scmString) - url.set(githubUrl) - } - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index a5bca4b..897a4c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,17 +1,6 @@ rootProject.name = "compose-web-material" -include("lib") -project(":lib").name = rootProject.name + +include("compose-web-common") +include(rootProject.name) include("gradle-plugins") project(":gradle-plugins").name = rootProject.name + "-gradle-plugins" - -buildscript { - repositories { - mavenLocal() - gradlePluginPortal() - //maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } - dependencies { - classpath(kotlin("gradle-plugin", "1.7.20")) - classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.3.2") - } -} From a9833df64fe9ea34bc4ab6ef51f3e2ad7428c1af Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Tue, 22 Nov 2022 15:03:19 +0800 Subject: [PATCH 06/14] Move code not related to Material Design into ":compose-web-common" --- .../com/huanshankeji/compose/web/Layouts.kt | 26 ++++++++++++++++-- .../huanshankeji/compose/web/LoadingState.kt | 0 .../com/huanshankeji/compose/web/Types.kt | 0 .../compose/web/attributes/AttrsScope.kt | 0 .../com/huanshankeji/compose/web/css/CSS.kt | 0 .../compose/web/dom/ElementScope.kt | 0 .../compose/web/material/Layouts.kt | 27 ------------------- 7 files changed, 24 insertions(+), 29 deletions(-) rename {compose-web-material => compose-web-common}/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt (82%) rename {compose-web-material => compose-web-common}/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt (100%) rename {compose-web-material => compose-web-common}/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt (100%) rename {compose-web-material => compose-web-common}/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt (100%) rename {compose-web-material => compose-web-common}/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt (100%) rename {compose-web-material => compose-web-common}/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt (100%) diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt similarity index 82% rename from compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt rename to compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt index db56511..8483497 100644 --- a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt @@ -1,7 +1,6 @@ package com.huanshankeji.compose.web import androidx.compose.runtime.Composable -import com.huanshankeji.compose.web.material.defaultSpacing import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.ContentBuilder import org.jetbrains.compose.web.dom.Div @@ -64,6 +63,29 @@ fun RowWithSpaceBetween( styles?.invoke(this) }, content) +@Composable +fun ColumnWithGaps( + styles: Styles? = null, + gap: CSSNumeric, + fitContent: Boolean = true, + content: ContentBuilder +) = + Column({ + gap(gap) + styles?.invoke(this) + }, fitContent, content) + +@Composable +fun RowWithGaps( + styles: Styles? = null, + gap: CSSNumeric, + content: ContentBuilder +) = + Row({ + gap(gap) + styles?.invoke(this) + }, content) + @Composable fun Centered( styles: Styles? = null, @@ -88,7 +110,7 @@ fun CenteredInViewport( @Composable fun FrGrid( numColumns: Int, - gap: CSSNumeric = defaultSpacing, + gap: CSSNumeric, content: HTMLElementContent ) = Div({ diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt similarity index 100% rename from compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt rename to compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/LoadingState.kt diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt similarity index 100% rename from compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt rename to compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt similarity index 100% rename from compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt rename to compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrsScope.kt diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt similarity index 100% rename from compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt rename to compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/CSS.kt diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt similarity index 100% rename from compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt rename to compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/dom/ElementScope.kt diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt index ba1bac2..afe004c 100644 --- a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt +++ b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt @@ -2,38 +2,11 @@ package com.huanshankeji.compose.web.material import androidx.compose.runtime.Composable import com.huanshankeji.compose.web.CenteredInViewport -import com.huanshankeji.compose.web.Column -import com.huanshankeji.compose.web.Row import com.huanshankeji.compose.web.Styles import org.jetbrains.compose.web.attributes.AttrsScope -import org.jetbrains.compose.web.css.CSSNumeric -import org.jetbrains.compose.web.css.gap import org.jetbrains.compose.web.dom.ContentBuilder import org.w3c.dom.HTMLDivElement -@Composable -fun ColumnWithGaps( - styles: Styles? = null, - gap: CSSNumeric = defaultSpacing, - fitContent: Boolean = true, - content: ContentBuilder -) = - Column({ - gap(gap) - styles?.invoke(this) - }, fitContent, content) - -@Composable -fun RowWithGaps( - styles: Styles? = null, - gap: CSSNumeric = defaultSpacing, - content: ContentBuilder -) = - Row({ - gap(gap) - styles?.invoke(this) - }, content) - @Composable fun CenteredCardInViewport( viewportDivStyles: Styles? = null, From 96334bbfc22f6f060196cd446fe72a9d7a17e1a8 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 9 Dec 2022 18:34:11 +0800 Subject: [PATCH 07/14] Add `operator fun AttrBuilderContext.plus(other: AttrBuilderContext?): AttrBuilderContext` from an internal project --- .../compose/web/attributes/AttrBuilderContext.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt new file mode 100644 index 0000000..ea6b5c7 --- /dev/null +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt @@ -0,0 +1,13 @@ +package com.huanshankeji.compose.web.attributes + +import org.jetbrains.compose.web.dom.AttrBuilderContext +import org.w3c.dom.Element + +operator fun AttrBuilderContext.plus(other: AttrBuilderContext?): AttrBuilderContext = + if (other === null) this + else { + { + this@plus() + other() + } + } From f8e82798201abe90c15a547b940b06be762e836b Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 9 Dec 2022 20:37:05 +0800 Subject: [PATCH 08/14] Add an `attrs` helper function --- .../compose/web/attributes/AttrBuilderContext.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt index ea6b5c7..3d14add 100644 --- a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/attributes/AttrBuilderContext.kt @@ -11,3 +11,8 @@ operator fun AttrBuilderContext.plus(other: AttrB other() } } + +/** A helper function to create [AttrBuilderContext]s where type inference doesn't work */ +@Suppress("NOTHING_TO_INLINE") +inline fun attrs(noinline attrs: AttrBuilderContext) = + attrs From 4d9b0470d22b1cd52d6acfa7de598b1be2c6f27c Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sat, 10 Dec 2022 01:05:11 +0800 Subject: [PATCH 09/14] Update the project version to "0.2.0-SNAPSHOT" --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index c96c302..bc2ad2a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,4 +1,4 @@ -const val projectVersion = "0.1.1-SNAPSHOT" +const val projectVersion = "0.2.0-SNAPSHOT" object DependencyVersions { val webcomponents = "2.6.0" From edd02bbd610cc70a08e6bf3f4f5c28ac42008041 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Wed, 14 Dec 2022 19:11:48 +0800 Subject: [PATCH 10/14] Change the first argument from `styles` to `attrs` for better customizability for the layouts --- .../com/huanshankeji/compose/web/Layouts.kt | 118 +++++++++++------- .../com/huanshankeji/compose/web/Types.kt | 3 - .../huanshankeji/compose/web/css/Styles.kt | 10 ++ .../compose/web/material/Layouts.kt | 4 +- 4 files changed, 85 insertions(+), 50 deletions(-) create mode 100644 compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/Styles.kt diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt index 8483497..cfc52b8 100644 --- a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt @@ -1,7 +1,12 @@ package com.huanshankeji.compose.web import androidx.compose.runtime.Composable +import com.huanshankeji.compose.web.attributes.attrs +import com.huanshankeji.compose.web.attributes.plus +import com.huanshankeji.compose.web.css.Styles +import com.huanshankeji.compose.web.css.wrapInAttrs import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.AttrBuilderContext import org.jetbrains.compose.web.dom.ContentBuilder import org.jetbrains.compose.web.dom.Div import org.w3c.dom.HTMLDivElement @@ -10,102 +15,125 @@ import org.w3c.dom.HTMLDivElement @Composable fun Flexbox( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, content: ContentBuilder ) = - Div({ + Div(attrs { style { display(DisplayStyle.Flex) - styles?.invoke(this) } - }, content) + } + attrs, content) + +@Composable +fun Flexbox(styles: Styles? = null, content: ContentBuilder) = + Flexbox(styles.wrapInAttrs(), content) @Composable fun Column( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, fitContent: Boolean = true, content: ContentBuilder ) = - Flexbox({ - flexDirection(FlexDirection.Column) - if (fitContent) property("width", "fit-content") - styles?.invoke(this) - }, content) + Flexbox(attrs { + style { + flexDirection(FlexDirection.Column) + if (fitContent) property("width", "fit-content") + } + } + attrs, content) + +@Composable +fun Column(styles: Styles? = null, fitContent: Boolean = true, content: ContentBuilder) = + Column(styles.wrapInAttrs(), fitContent, content) @Composable fun ColumnWithSpaceBetween( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, fitContent: Boolean = true, content: ContentBuilder ) = - Column({ - justifyContent(JustifyContent.SpaceBetween) - styles?.invoke(this) - }, fitContent, content) + Column(attrs { + style { + justifyContent(JustifyContent.SpaceBetween) + } + } + attrs, fitContent, content) + + +@Composable +fun Row( + attrs: AttrBuilderContext? = null, + content: ContentBuilder +) = + Flexbox(attrs { + style { + flexDirection(FlexDirection.Row) + } + } + attrs, content) @Composable fun Row( styles: Styles? = null, content: ContentBuilder ) = - Flexbox({ - flexDirection(FlexDirection.Row) - styles?.invoke(this) - }, content) + Row(styles.wrapInAttrs(), content) @Composable fun RowWithSpaceBetween( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, content: ContentBuilder ) = - Row({ - justifyContent(JustifyContent.SpaceBetween) - styles?.invoke(this) - }, content) + Row(attrs { + style { + justifyContent(JustifyContent.SpaceBetween) + } + } + attrs, content) @Composable fun ColumnWithGaps( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, gap: CSSNumeric, fitContent: Boolean = true, content: ContentBuilder ) = - Column({ - gap(gap) - styles?.invoke(this) - }, fitContent, content) + Column(attrs { + style { + gap(gap) + } + } + attrs, fitContent, content) @Composable fun RowWithGaps( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, gap: CSSNumeric, content: ContentBuilder ) = - Row({ - gap(gap) - styles?.invoke(this) - }, content) + Row(attrs { + style { + gap(gap) + } + } + attrs, content) @Composable fun Centered( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, content: ContentBuilder ) = - Flexbox({ - alignItems(AlignItems.Center) - justifyContent(JustifyContent.Center) - styles?.invoke(this) - }, content) + Flexbox(attrs { + style { + alignItems(AlignItems.Center) + justifyContent(JustifyContent.Center) + } + } + attrs, content) @Composable fun CenteredInViewport( - styles: Styles? = null, + attrs: AttrBuilderContext? = null, content: ContentBuilder ) = - Centered({ - minHeight(100.vh) - styles?.invoke(this) - }, content) + Centered(attrs { + style { + minHeight(100.vh) + } + } + attrs, content) @Composable fun FrGrid( diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt index a8db126..561fc2c 100644 --- a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Types.kt @@ -1,7 +1,6 @@ package com.huanshankeji.compose.web import androidx.compose.runtime.Composable -import org.jetbrains.compose.web.css.StyleScope import org.jetbrains.compose.web.dom.AttrBuilderContext import org.jetbrains.compose.web.dom.ContentBuilder import org.jetbrains.compose.web.dom.Div @@ -19,6 +18,4 @@ typealias DivElementComposable = ElementComposable // `::Div` cannot be used directly because "Function References of @Composable functions are not currently supported" val DivComposable: ElementComposable = { attrs, content -> Div(attrs, content) } -typealias Styles = StyleScope.() -> Unit - typealias HTMLElementContent = (@Composable ElementScope.() -> Unit)? diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/Styles.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/Styles.kt new file mode 100644 index 0000000..584e546 --- /dev/null +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/Styles.kt @@ -0,0 +1,10 @@ +package com.huanshankeji.compose.web.css + +import org.jetbrains.compose.web.css.StyleScope +import org.jetbrains.compose.web.dom.AttrBuilderContext +import org.w3c.dom.Element + +typealias Styles = StyleScope.() -> Unit + +fun Styles?.wrapInAttrs(): AttrBuilderContext? = + this?.let { { style { it() } } } diff --git a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt index afe004c..44b4a13 100644 --- a/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt +++ b/compose-web-material/src/jsMain/kotlin/com/huanshankeji/compose/web/material/Layouts.kt @@ -2,7 +2,7 @@ package com.huanshankeji.compose.web.material import androidx.compose.runtime.Composable import com.huanshankeji.compose.web.CenteredInViewport -import com.huanshankeji.compose.web.Styles +import com.huanshankeji.compose.web.css.Styles import org.jetbrains.compose.web.attributes.AttrsScope import org.jetbrains.compose.web.dom.ContentBuilder import org.w3c.dom.HTMLDivElement @@ -13,6 +13,6 @@ fun CenteredCardInViewport( cardAttrs: (AttrsScope.() -> Unit)? = null, content: ContentBuilder ) = - CenteredInViewport(viewportDivStyles) { + CenteredInViewport({ viewportDivStyles?.let { style { it() } } }) { MdcCard(cardAttrs, content = content) } From 40d1f5d7765a526297da704781e864393030ffee Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 5 Jan 2023 02:49:52 +0800 Subject: [PATCH 11/14] Update a comment --- .../src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt index cfc52b8..e7ea9ce 100644 --- a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt @@ -11,7 +11,7 @@ import org.jetbrains.compose.web.dom.ContentBuilder import org.jetbrains.compose.web.dom.Div import org.w3c.dom.HTMLDivElement -// follow names in Android Jetpack Compose +// try to follow names in Android Jetpack Compose @Composable fun Flexbox( From d31c16302a92ec585873d0c891811a160e73b6be Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 6 Jan 2023 19:16:24 +0800 Subject: [PATCH 12/14] Add the `StyleScope` extension functions `width` and `height`, each of which takes a string argument, and a const string value `FIT_CONTENT` --- .../kotlin/com/huanshankeji/compose/web/Layouts.kt | 4 +++- .../com/huanshankeji/compose/web/css/StyleScope.kt | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/StyleScope.kt diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt index e7ea9ce..942a1d1 100644 --- a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt @@ -3,7 +3,9 @@ package com.huanshankeji.compose.web import androidx.compose.runtime.Composable import com.huanshankeji.compose.web.attributes.attrs import com.huanshankeji.compose.web.attributes.plus +import com.huanshankeji.compose.web.css.FIT_CONTENT import com.huanshankeji.compose.web.css.Styles +import com.huanshankeji.compose.web.css.width import com.huanshankeji.compose.web.css.wrapInAttrs import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.AttrBuilderContext @@ -37,7 +39,7 @@ fun Column( Flexbox(attrs { style { flexDirection(FlexDirection.Column) - if (fitContent) property("width", "fit-content") + if (fitContent) width(FIT_CONTENT) } } + attrs, content) diff --git a/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/StyleScope.kt b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/StyleScope.kt new file mode 100644 index 0000000..b0087a9 --- /dev/null +++ b/compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/css/StyleScope.kt @@ -0,0 +1,11 @@ +package com.huanshankeji.compose.web.css + +import org.jetbrains.compose.web.css.StyleScope + +fun StyleScope.width(value: String) = + property("width", value) + +fun StyleScope.height(value: String) = + property("height", value) + +const val FIT_CONTENT = "fit-content" From 77c3168aa06e3b007780fb87a997451e8d911f28 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sat, 7 Jan 2023 02:39:30 +0800 Subject: [PATCH 13/14] Update README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 368d7e3..1acb6c5 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,15 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.huanshankeji/compose-web-material)](https://search.maven.org/artifact/com.huanshankeji/compose-web-material) [![Gradle Plugin Portal](https://img.shields.io/gradle-plugin-portal/v/com.huanshankeji.compose-web-material-conventions)](https://plugins.gradle.org/plugin/com.huanshankeji.compose-web-material-conventions) -Some Material components for Compose for Web, based on [Material Web (Web Components)](https://github.com/material-components/material-web) (preferred) and [Material Components for the web](https://github.com/material-components/material-components-web) (fallback) +Some Material components for Compose for Web, based on [Material Web (with Web Components) (or material-web, or `mwc`)](https://github.com/material-components/material-web) (preferred) and [Material Components for the web (or material-components-web, or `mdc`)](https://github.com/material-components/material-components-web) (fallback) -This project is in prototype and the components are not complete. More components will be added. It will probably go through huge refactors and API changes, too. +~~This project is in prototype and the components are not complete. More components will be added. It will probably go through huge refactors and API changes, too.~~ + +**This project is not currently under active development. Here is a list of reasons and alternatives:** + +1. The [material-web](https://github.com/material-components/material-web) team is working on Material You (Material Design 3) support and [the Material 2 branch (`mwc`)](https://github.com/material-components/material-web/tree/mwc) is no longer under active development. Existing Compose wrappers of their Material 2 components are still kept in [the `:compose-web-material` subproject](compose-web-material) but not updated. +1. [KMDC](https://github.com/mpetuska/kmdc) wrapping around [material-components-web (`mdc`)](https://github.com/material-components/material-components-web) provides a much more complete set of Material Design components for Compose for Web. +1. We are currently focusing more on [compose-multiplatform-material](https://github.com/huanshankeji/compose-multiplatform-material) to provide multiplatform Compose Material wrappers, whose web portion depends on KMDC and [the `:compose-web-common` subproject](compose-web-common), which may be occasionally updated for the dependent project. ## Instructions on how to use Some configurations are needed to use this library due to the immaturities of this project and Kotlin/JS. From 05289d32641e023185f766e60101a265495a0c60 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 8 Jan 2023 22:56:00 +0800 Subject: [PATCH 14/14] Add blank lines in README.md as required by markdownlint --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 1acb6c5..64ad7a9 100644 --- a/README.md +++ b/README.md @@ -14,20 +14,25 @@ Some Material components for Compose for Web, based on [Material Web (with Web C 1. We are currently focusing more on [compose-multiplatform-material](https://github.com/huanshankeji/compose-multiplatform-material) to provide multiplatform Compose Material wrappers, whose web portion depends on KMDC and [the `:compose-web-common` subproject](compose-web-common), which may be occasionally updated for the dependent project. ## Instructions on how to use + Some configurations are needed to use this library due to the immaturities of this project and Kotlin/JS. ### Add the dependency + ```kotlin implementation("com.huanshankeji:compose-web-material:$version") ``` ### In code + Call `mwcRequires()` in your `main` function before calling any component Composable functions. ### Kotlin/JS Webpack configuration + If you use this library in an app project with Webpack [which Kotlin/JS currently uses](https://kotlinlang.org/docs/js-project-setup.html), you might want to configure it as recommended by Material Web and Material Components for the web. Some instructions on how to do this simply are as below. This plugin helps add the dependency to this project (if you do this you can skip the "Add the dependency" step above) and the `devNpm` dependencies: + ```kotlin plugins { id("com.huanshankeji.compose-web-material-conventions") version someVersion