From 68a483be96756fd81642f264b19bc109428ac343 Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Fri, 24 Apr 2026 10:35:18 +0200 Subject: [PATCH 1/2] feat: use proper name and icons in AS --- .idea/icon.png | Bin 12668 -> 5377 bytes app-feature-preview/build.gradle.kts | 2 +- app/core/build.gradle.kts | 6 +++--- app/storage/build.gradle.kts | 2 +- app/ui/legacy/build.gradle.kts | 6 +++--- backend/api/build.gradle.kts | 2 +- backend/demo/build.gradle.kts | 2 +- backend/imap/build.gradle.kts | 6 +++--- backend/jmap/build.gradle.kts | 2 +- backend/pop3/build.gradle.kts | 6 +++--- feature/account/common/build.gradle.kts | 2 +- feature/account/edit/build.gradle.kts | 2 +- feature/account/oauth/build.gradle.kts | 2 +- .../server/certificate/build.gradle.kts | 2 +- .../account/server/settings/build.gradle.kts | 4 ++-- .../server/validation/build.gradle.kts | 8 ++++---- feature/account/setup/build.gradle.kts | 8 ++++---- feature/autodiscovery/api/build.gradle.kts | 2 +- .../providersxml/build.gradle.kts | 2 +- mail/common/build.gradle.kts | 2 +- mail/protocols/imap/build.gradle.kts | 4 ++-- mail/protocols/pop3/build.gradle.kts | 4 ++-- mail/protocols/smtp/build.gradle.kts | 4 ++-- mail/testing/build.gradle.kts | 2 +- settings.gradle.kts | 18 ++++++++++++------ 25 files changed, 53 insertions(+), 47 deletions(-) diff --git a/.idea/icon.png b/.idea/icon.png index a73d1d3aefc74bc35f117cd50a4ee1e35e91d4f0..8e22a94699015afa7422e7a4bf77f7eeeec27d0c 100644 GIT binary patch literal 5377 zcmeAS@N?(olHy`uVBq!ia0y~yU^oE69Bd2>3_*8t*cliYSkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7}%1$-CY>K z;HUHMdIkmt&H|6fVg?3oArNM~bhqvg1A|Dar;B4q#jUq; zaysj$8OtthT6m+6OXT46eLB%$xvsxi7v^P%dn6s_TkCSRJ?p!7>lPvHhiyw*Rr+MD zGnu=(7C1awcGt`=g0XC2;3TstM^pov61<&1UpuBhv-*794&%p_A5Y(yH}m`~|9_k3^NQc^6l=1$n>~$jJHy%oXAkr`7;oT;;AByK9Q?_Rr$T%O!yeW@ zj266enEKeO&c#mVI-~XM+?;o&Vg=d-`~~743PYYu_2a1!tq`F&&l{N?;uk!>Gt=q)ngq6v?cd6o?;enCwG&vXBgt0Pu+S;B zwF#uDSpI{>hIIj^i$g@z8;&#EKChefp7;4x2EXsK!V;_tq6=TSt~BUl>}RPuH}}+a zw$Din%d34Q)*t=PCLpjSlIVaf)c3t1XXwPuX>v~U6;2uUBffttL zMVitZr+-RZUVWA=K}2+aP|Y=_#f7|jvs_a_1~F6!y_m9&)s?Y~fuFtVoF(_)2Ti;J z^Y_+@<#z-J{y8M@p|$m#mi`HlbF3a5f3aiVBmcI>-%Pg8*FF2yIEPmt|0n;VN8x|Y z8WiNOo2jsT@`H-`|06^Gbp7ASTw%8EX64CJkr$p@&aa=sSN=G&EbiG`rlajMe=X_v z2oyVb%;Egbe>?9PEN6T)IcBlL)-Mw^PASb`u`|7%a&rw^NBq44nYmAbyk?s>M5pb} zNm^Ija6Is%_R{lFHoE6e^hheyg+4F*a>#6{O~Hpv4%b4LY))->yW+>xPl^r8U+Qe) z5!gS|b^Y`3Q@ytz-SSgj%Pq3M_oGFX`t+cAa}K=bQq5m~<_tsm;z!}9rkAGpyhxK; z5N+k;s%elZ=v(; zEa#ZdHmaYS>B6={RCIrkrOCrgyPK@L+^v*cHI2R>*uwa3QlDF3*O^#`X`f%rNv!W)xX^g;VTj;K8m(+9u2zqPMGoGRbfp?BY+l>aswKXWFl=Dh7H!z6rwSSj2*)-J!vaH_l{=fek|NqhvRYh@O63sua zelMK=Tff8C(|z(0``WG#yf^0l-e9*m?r3~pgxIz8YsuyBnm_Pfx~TH8o$(FBx90l? zcYPGTG*N@~*shPlH~8z0o5w~=GhaIT>kD&4cK-Br+)F(ovh$Ds`ojEZ*Wm_TIp+;r zzu&np-7mcK#Eo+MF3vE|*YW$fQ)*u<4iKKm=d5XFD)@f4xZ53uXY11q^7}m67m7%J ze#Y@^efpBa6U-TcA6x7;U&*P(@%b6Yxp%$>rh2kn{5%XSNe;2B0L~lAGzwYb4>W7~GA1fKOZ@Dcf7Fd(7Hc3h!e0i5;^5c8uF|pnYiUqW9soC=@#99iNJ6=yHQwtEDVw0BBHf_JQUY+~{ zZsvwr3uHd-{&CQqjltB>GLY*L`+P};D=bePR(8nOWH1B>Pcd4mQukpcql0fi*OXa5 z4ju<7)C}x;#J-_-;{=`056=p}IohIpFI`Q&X5AJ{oRsz?8u71cDiIpXZnk9Vd{GGJK2`Nv~rx4hR0 zh6QRLgr6$ZX&5p$%sRk7rTfQ17G8!dCeKrze*zY8JXNdHNCY{4#+1cB4zhn| z)|tA5^U&q*!bi$ha(?QRlvdofy7pJqzXG|V>%TMW$gbWwHQ{_isAGz`5pGn3Hh|lc}TGJ09Ko6+O}a zSXAx#4dgwAmz)!R6C%9iQD3jX?U{Dx;!QrjwsCm4aaJ^EuB6X-mMkU(*FP(D|4;jr z|5G@mh0(#+KzOQN-3kTfhFJ=tqWj%lK@MB+$lvu2gVOW6XV#m?5Z4Ab3@Bx{Elrn`5%J+Wie=4=7&TUv6nLq0mP zP58ZVXX}A!jgm$O*SkE{I?`|bZS|UI_8U?eW<{s$XHGoA8<2B6T}=Cy*8=UkEa%Sk zZ92vB>NpY10o@?L4Mn;g3nPXC1h?Rnpi@OZL_x!{o*H41Ihnj)w>zd?)qcYDWK-e@~1X zKKd)(>bkpA-CB5#tZ0Ak!lSmf7h6?x*{jDRIg_TV9bk>tL;e?=9UG~q(rMfZ=ykeVYt?OLOWL>0Y=xJ+JAm?2L_q zFHh`|C|lk=f1RCANLgEWdQ-9MF4j|9O}09v%ZIe?-LYIP;d`2d@EMlm#c@2GAH!Ss zO3e0J@bo&*1I5_?+*%jIcD%gy^1)*@gM6+z!h2>a)-}w|JL>ZH?(^?6|J4?lW@vsa zlK=DV`OA;~ehFWX89Q#2kpBA3(sH8Q>HPY4M z&hJw55twgSmK5<@{_wAd=82zfU22}Or|s+E{G_+_JacAj?=LuVJAF&)ui8>hVH5So zTlw;iT3ynQ?frapQ^v&e40gIQFVAQFoU7YBW7pN2@B6nssLR#AvToMDsQOBV-_hR> zz34aa%Xw&MVJPue@Z0uxM}IwSd})yt{;)1Lzh;j8W8>1*h1+=2(wmh3KKg2zZOfh9 zoBz-KqQx9_Kkw^~V%H|ty^%aJ|JtYXN0$CSeD8Yi*WOejf3ECVO92%OAb7 z({WeUW{#42pDp?-c?~y&*L%OS+8#Sc1&-6N z3?4?kFaNO1S2+CPt)~^{>dmVR-lba?yuZUx*5~>A(|wMb@24X&)qd>S&MPnYCNGfr zN2_YL{Z#M#ps=pIlt}jr>ormYdB{tc*I+<_qaUUhW;))jyE|>SzggbdcK#syH2uu)*PiYd z{1LZ{b58Z2X33~`m*(Y~g#E_Mx?Yn@)Ew@KA&aTq9ZvH)4iTB?QqtzWVJeaSWzgOH+ z?ChoXgYVc3rF5pqzn$p~NngJ*9j@l!%bk7i{VI*%*}n^4OC9~aFzD#o?3AqH`Y1IH zzFcL4JH)8p+ojmQ}u%EGdLTgvke{MucfG-t)(*W0H*7g)(}b9g;QhRo-%J;e!pOGQGaB(%)7XQd2yc6EP;*pc}5Z)hs|HzJSKgDbO z4EF7mH$TjBa4~bLT0KV>fBo~q{|k5g5T0%F)%VuhNR^j&7k*}Fd8C|qJ^#Pgzi-NK zSU%2v^!fIueE+=bYx}cK?>}NRmvhm{Dqh~)^Vw<>uFbCy*O1>TAtkpUE2Fw-a$c>l zuxzc>x%usnQk(W|c^7c?LYdQH=G2SqlgtkYWgC=~G^~1Vd~|=bf5qnrpIByL+1;0Y zKl~|ka%cavp*Hde?}jO>xMgL}2>q`(p7-{f$bucEy>WNbW+rTCdHSB2S!dg`RcV6z z%c{A;eNxhdLu6%jBH25n69RSrZ_N1^|N2I+^u=lWAIwy^^x|r1nwrJ79X<-Ze~uP# zFM0Js;i~iP$@9y@%?j7r-utBOdeB8`=e2#(<*C7+s#nN$r8lwW`)vF1AgJR`Y(Q%Uq9(pa`UByPkZ={4*Yq)($37|>qDN8+rK}$_KIh{$+B$| zzu&I@>5!kLRw0zE(dqNxcc`M!BmX`3SLQ$3`z zH{)y7*NuBy`0ZUEEz8`#uk*Xv+e2%w3dik#bj9q$y=8HEFW!2TwI4cfFZ!PEZ}qj` zZ?(liG0MiVuT<;x)>p~ZD=q(oe98yuyjA|tO=`*E&}RpGO)Bn(da13j{3CMp__wsZ z=0C1^zASjkD^T@z>6Uc2Q2DcB|F8P)F36HTGCzH(>h?!h%nC{`^Qc+uGJjjU@Os>| zY4iDcKJ5N~wC?+PhL--fOP{soe9S%_U$tYRq|b*#!7Yzx9;o|%zNPMa@k;~FKgV@> z`@7u|cpACu5AFJ6K5c0SD2QGio2&It=vat;@~daod)@N>a4{^rzrTqyOjz!(Vk7tS zrOrpH@()MdpBuR9$7$~0r>w7h%T@bOUU@M6sG6*UTHcaIZRzqyE>cI@zioN4+~VW= zEB(B)e)trqojb*!$fPLyO2^nop=I+Y=NsYoCi1EBzJ3*M|H^vl%vn)t_LcUNU;h(L z|LS|`p@z4@hi~s!+7-@t6>r~eS{G_HN2eyU!GuZCC-lZ?u4(V9a!&b3h@alsXKKoL zuJmQbvm@oP3v}kZj(B{%Rs3SuDbd`ZsaIFT{sYZz7QgA&fZ}?z`tfWmXZ$+q;l&hxEdN(%z`0nk$u5}++zC<}_iqa<~ zpLni953po=!YzjN4F7f~M+R~ouCzH@&DO!QFV8?mV1IQ~_q0b-m?s{*&by@NkHib+ zeH$x+HN8$=nEpex(z4|4z3b;04quw6>D4INmo0l@pZo%MP#4=EQ|kPTKbzVbgb!G~ z)DT_DFo&TnDE>rL&cjd6y5AYkd%CaEV14j!SMB=0DqmYA!=-or2{;}2!0cs)sA|8= z>f7IMy`8CluIO+7SB?T14iERW8kGkaQNMD+$eM+d3+5fb$(etk6>2g`Q%x;ZYFBb<)aW&wq$@;l3c(Ywk&OKFgecKzm z8mG)OcGXlg)2sg#@;@ejMtS0zA8chF@|}xxCdhv7lrM^xe3xjXCLnV3IM2h(vbdtS z(m$7)*Pd=@J|KI^eYr-l0neS?e_jS(FRJ|9H0|#GFA34IACj-IblFR?y^H?$<>VZB z*Ub-}`^EeUx^46z@Yt_f>DD)~uIH1zfAIN5;pC(CZy4|r*= zpPmGnZF<6yP|B-F+fUCs5lX4stW(^`u#!AAu4=IR^X|*!UrB}f1Cf~WRUq3&x3ONs|){Hap$ktB0bkU zKE*bdPh>^r!BSnSd&T`GJydd^SRJx{sfHAAxPgy25pb=MIMn z^Xi7FD=bg7N_^0}_xZ)WL)BUrGxwwi%fxT|f22u$!>6PFnV;U(7J6*P9}60e^mO%e JS?83{1OPm_Kmh;% literal 12668 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 b|7YKoVE2vj{+?wF3=9mOu6{1-oD!M<5LINY diff --git a/app-feature-preview/build.gradle.kts b/app-feature-preview/build.gradle.kts index 53b5803c20..301099ddba 100644 --- a/app-feature-preview/build.gradle.kts +++ b/app-feature-preview/build.gradle.kts @@ -66,7 +66,7 @@ android { dependencies { implementation(projects.core.ui.compose.designsystem) implementation(projects.core.common) - implementation(projects.mail.common) + implementation(projects.mailcore.common) implementation(projects.feature.onboarding) implementation(projects.feature.account.setup) diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts index 7ba0b6816e..8dfe33e30e 100644 --- a/app/core/build.gradle.kts +++ b/app/core/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) api(projects.backend.api) api(projects.app.htmlCleaner) api(projects.core.android.common) @@ -29,9 +29,9 @@ dependencies { testApi(projects.core.testing) testApi(projects.core.android.testing) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(projects.backend.imap) - testImplementation(projects.mail.protocols.smtp) + testImplementation(projects.mailcore.protocols.smtp) testImplementation(projects.app.storage) testImplementation(projects.app.testing) diff --git a/app/storage/build.gradle.kts b/app/storage/build.gradle.kts index 977e383881..222b87beeb 100644 --- a/app/storage/build.gradle.kts +++ b/app/storage/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(libs.commons.io) implementation(libs.moshi) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(projects.app.testing) testImplementation(libs.robolectric) testImplementation(libs.commons.io) diff --git a/app/ui/legacy/build.gradle.kts b/app/ui/legacy/build.gradle.kts index d03fdd116c..b5c9681538 100644 --- a/app/ui/legacy/build.gradle.kts +++ b/app/ui/legacy/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { implementation(projects.app.core) implementation(projects.feature.autodiscovery.api) implementation(projects.feature.autodiscovery.providersxml) - implementation(projects.mail.common) + implementation(projects.mailcore.common) implementation(projects.uiUtils.toolbarBottomSheet) implementation(projects.core.featureflags) @@ -16,7 +16,7 @@ dependencies { // TODO: Remove AccountOauth dependency implementation(projects.feature.account.oauth) - compileOnly(projects.mail.protocols.imap) + compileOnly(projects.mailcore.protocols.imap) implementation(projects.plugins.openpgpApiLib.openpgpApi) @@ -71,7 +71,7 @@ dependencies { testImplementation(projects.core.testing) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(projects.app.storage) testImplementation(projects.app.testing) testImplementation(libs.robolectric) diff --git a/backend/api/build.gradle.kts b/backend/api/build.gradle.kts index 2aa9cf93c5..829ec12a60 100644 --- a/backend/api/build.gradle.kts +++ b/backend/api/build.gradle.kts @@ -4,5 +4,5 @@ plugins { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) } diff --git a/backend/demo/build.gradle.kts b/backend/demo/build.gradle.kts index f969cb13fc..5e5159025f 100644 --- a/backend/demo/build.gradle.kts +++ b/backend/demo/build.gradle.kts @@ -11,5 +11,5 @@ dependencies { implementation(libs.moshi) ksp(libs.moshi.kotlin.codegen) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) } diff --git a/backend/imap/build.gradle.kts b/backend/imap/build.gradle.kts index 3c342a1550..d6c4a39d66 100644 --- a/backend/imap/build.gradle.kts +++ b/backend/imap/build.gradle.kts @@ -5,12 +5,12 @@ plugins { dependencies { api(projects.backend.api) - api(projects.mail.protocols.imap) - api(projects.mail.protocols.smtp) + api(projects.mailcore.protocols.imap) + api(projects.mailcore.protocols.smtp) implementation(libs.kotlinx.coroutines.core) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(projects.backend.testing) testImplementation(libs.mime4j.dom) } diff --git a/backend/jmap/build.gradle.kts b/backend/jmap/build.gradle.kts index 112fae7fe5..685bfcf4c5 100644 --- a/backend/jmap/build.gradle.kts +++ b/backend/jmap/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(libs.moshi) ksp(libs.moshi.kotlin.codegen) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(projects.backend.testing) testImplementation(libs.okhttp.mockwebserver) } diff --git a/backend/pop3/build.gradle.kts b/backend/pop3/build.gradle.kts index 4df78de333..df503a32c1 100644 --- a/backend/pop3/build.gradle.kts +++ b/backend/pop3/build.gradle.kts @@ -5,8 +5,8 @@ plugins { dependencies { api(projects.backend.api) - api(projects.mail.protocols.pop3) - api(projects.mail.protocols.smtp) + api(projects.mailcore.protocols.pop3) + api(projects.mailcore.protocols.smtp) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) } diff --git a/feature/account/common/build.gradle.kts b/feature/account/common/build.gradle.kts index aa32047961..56f1106f12 100644 --- a/feature/account/common/build.gradle.kts +++ b/feature/account/common/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(projects.core.ui.compose.designsystem) implementation(projects.core.common) - implementation(projects.mail.common) + implementation(projects.mailcore.common) testImplementation(projects.core.ui.compose.testing) } diff --git a/feature/account/edit/build.gradle.kts b/feature/account/edit/build.gradle.kts index 5ef5291d04..16ff0341fe 100644 --- a/feature/account/edit/build.gradle.kts +++ b/feature/account/edit/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { implementation(projects.core.ui.compose.designsystem) implementation(projects.core.common) - implementation(projects.mail.common) + implementation(projects.mailcore.common) implementation(projects.feature.account.common) implementation(projects.feature.account.oauth) diff --git a/feature/account/oauth/build.gradle.kts b/feature/account/oauth/build.gradle.kts index 7c4b986d81..f52033d231 100644 --- a/feature/account/oauth/build.gradle.kts +++ b/feature/account/oauth/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { implementation(projects.core.common) implementation(projects.core.android.common) - implementation(projects.mail.common) + implementation(projects.mailcore.common) implementation(projects.feature.account.common) diff --git a/feature/account/server/certificate/build.gradle.kts b/feature/account/server/certificate/build.gradle.kts index a392d29943..d576a45c98 100644 --- a/feature/account/server/certificate/build.gradle.kts +++ b/feature/account/server/certificate/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(projects.core.common) implementation(projects.feature.account.common) - implementation(projects.mail.common) + implementation(projects.mailcore.common) testImplementation(projects.core.ui.compose.testing) } diff --git a/feature/account/server/settings/build.gradle.kts b/feature/account/server/settings/build.gradle.kts index 5e9c127b18..95dd1cc961 100644 --- a/feature/account/server/settings/build.gradle.kts +++ b/feature/account/server/settings/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { implementation(projects.core.ui.compose.designsystem) implementation(projects.core.common) - implementation(projects.mail.common) - implementation(projects.mail.protocols.imap) + implementation(projects.mailcore.common) + implementation(projects.mailcore.protocols.imap) implementation(projects.feature.account.common) diff --git a/feature/account/server/validation/build.gradle.kts b/feature/account/server/validation/build.gradle.kts index 75c9d1be0e..f868cf17f3 100644 --- a/feature/account/server/validation/build.gradle.kts +++ b/feature/account/server/validation/build.gradle.kts @@ -20,10 +20,10 @@ dependencies { implementation(projects.core.ui.compose.designsystem) implementation(projects.core.common) - implementation(projects.mail.common) - implementation(projects.mail.protocols.imap) - implementation(projects.mail.protocols.pop3) - implementation(projects.mail.protocols.smtp) + implementation(projects.mailcore.common) + implementation(projects.mailcore.protocols.imap) + implementation(projects.mailcore.protocols.pop3) + implementation(projects.mailcore.protocols.smtp) implementation(projects.feature.account.common) implementation(projects.feature.account.oauth) diff --git a/feature/account/setup/build.gradle.kts b/feature/account/setup/build.gradle.kts index 29072b8e41..8579a57422 100644 --- a/feature/account/setup/build.gradle.kts +++ b/feature/account/setup/build.gradle.kts @@ -20,10 +20,10 @@ dependencies { implementation(projects.core.ui.compose.designsystem) implementation(projects.core.common) - implementation(projects.mail.common) - implementation(projects.mail.protocols.imap) - implementation(projects.mail.protocols.pop3) - implementation(projects.mail.protocols.smtp) + implementation(projects.mailcore.common) + implementation(projects.mailcore.protocols.imap) + implementation(projects.mailcore.protocols.pop3) + implementation(projects.mailcore.protocols.smtp) implementation(projects.feature.autodiscovery.service) diff --git a/feature/autodiscovery/api/build.gradle.kts b/feature/autodiscovery/api/build.gradle.kts index 350629b443..fa722a61b7 100644 --- a/feature/autodiscovery/api/build.gradle.kts +++ b/feature/autodiscovery/api/build.gradle.kts @@ -4,6 +4,6 @@ plugins { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) api(projects.core.common) } diff --git a/feature/autodiscovery/providersxml/build.gradle.kts b/feature/autodiscovery/providersxml/build.gradle.kts index 32288d6a8d..5c67c49841 100644 --- a/feature/autodiscovery/providersxml/build.gradle.kts +++ b/feature/autodiscovery/providersxml/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(projects.core.common) - implementation(projects.mail.common) + implementation(projects.mailcore.common) implementation(projects.feature.autodiscovery.api) implementation(libs.timber) diff --git a/mail/common/build.gradle.kts b/mail/common/build.gradle.kts index 5c3e86dcb9..971f498290 100644 --- a/mail/common/build.gradle.kts +++ b/mail/common/build.gradle.kts @@ -20,6 +20,6 @@ dependencies { // We're only using this for its DefaultHostnameVerifier implementation(libs.apache.httpclient5) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(libs.icu4j.charset) } diff --git a/mail/protocols/imap/build.gradle.kts b/mail/protocols/imap/build.gradle.kts index 1c9366ef0b..3024b3a6f2 100644 --- a/mail/protocols/imap/build.gradle.kts +++ b/mail/protocols/imap/build.gradle.kts @@ -9,14 +9,14 @@ if (testCoverageEnabled) { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) implementation(libs.jzlib) implementation(libs.jutf7) implementation(libs.commons.io) implementation(libs.okio) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(libs.okio) testImplementation(libs.mime4j.core) } diff --git a/mail/protocols/pop3/build.gradle.kts b/mail/protocols/pop3/build.gradle.kts index 9bb46751be..cf51cb6818 100644 --- a/mail/protocols/pop3/build.gradle.kts +++ b/mail/protocols/pop3/build.gradle.kts @@ -9,9 +9,9 @@ if (testCoverageEnabled) { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(libs.okio) testImplementation(libs.jzlib) testImplementation(libs.commons.io) diff --git a/mail/protocols/smtp/build.gradle.kts b/mail/protocols/smtp/build.gradle.kts index 56f1805883..c67df78c9c 100644 --- a/mail/protocols/smtp/build.gradle.kts +++ b/mail/protocols/smtp/build.gradle.kts @@ -9,12 +9,12 @@ if (testCoverageEnabled) { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) implementation(libs.commons.io) implementation(libs.okio) - testImplementation(projects.mail.testing) + testImplementation(projects.mailcore.testing) testImplementation(libs.okio) testImplementation(libs.jzlib) } diff --git a/mail/testing/build.gradle.kts b/mail/testing/build.gradle.kts index 38ff953792..81c3c91459 100644 --- a/mail/testing/build.gradle.kts +++ b/mail/testing/build.gradle.kts @@ -9,7 +9,7 @@ if (testCoverageEnabled) { } dependencies { - api(projects.mail.common) + api(projects.mailcore.common) api(libs.okio) api(libs.junit) diff --git a/settings.gradle.kts b/settings.gradle.kts index e12eb2c6ac..3e7cb4d690 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,7 @@ dependencyResolutionManagement { enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -rootProject.name = "k-9" +rootProject.name = "Mail" includeBuild("build-plugin") @@ -81,13 +81,19 @@ include( ) include( - ":mail:common", - ":mail:testing", - ":mail:protocols:imap", - ":mail:protocols:pop3", - ":mail:protocols:smtp", + ":mailcore:common", + ":mailcore:testing", + ":mailcore:protocols:imap", + ":mailcore:protocols:pop3", + ":mailcore:protocols:smtp", ) +project(":mailcore:common").projectDir = file("mail/common") +project(":mailcore:testing").projectDir = file("mail/testing") +project(":mailcore:protocols:imap").projectDir = file("mail/protocols/imap") +project(":mailcore:protocols:pop3").projectDir = file("mail/protocols/pop3") +project(":mailcore:protocols:smtp").projectDir = file("mail/protocols/smtp") + include( ":backend:api", ":backend:testing", -- GitLab From be32496cf40bba241e1187e37ea3ebbe8e12994c Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Fri, 24 Apr 2026 17:52:56 +0200 Subject: [PATCH 2/2] tests: fix flakky tests --- .../com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java | 2 +- .../test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java | 2 +- .../com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java index a547ed0be9..3a8d7f4923 100644 --- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java +++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java @@ -157,7 +157,7 @@ public class MockImapServer { checkServerRunning(); try { - waitForConnectionClosed.await(300L, TimeUnit.MILLISECONDS); + waitForConnectionClosed.await(5000L, TimeUnit.MILLISECONDS); } catch (InterruptedException ignored) { } diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java index 36b0e48ac4..fa289f0b87 100644 --- a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java +++ b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java @@ -157,7 +157,7 @@ public class MockPop3Server { checkServerRunning(); try { - waitForConnectionClosed.await(300L, TimeUnit.MILLISECONDS); + waitForConnectionClosed.await(5000L, TimeUnit.MILLISECONDS); } catch (InterruptedException ignored) { } diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java index b8fb14aefc..2c2545f09d 100644 --- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java +++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java @@ -160,7 +160,7 @@ public class MockSmtpServer { checkServerRunning(); try { - waitForConnectionClosed.await(300L, TimeUnit.MILLISECONDS); + waitForConnectionClosed.await(5000L, TimeUnit.MILLISECONDS); } catch (InterruptedException ignored) { } -- GitLab