From 4f61aa65463c4ca4678d00bbcee3674143c5f6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Sun, 17 May 2020 20:46:42 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=B4=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=83=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=20=D0=B2=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- choco/coverage41c.nuspec | 2 +- src/main/java/com/clouds42/Utils.java | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d1947e8..5d99988 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'com.clouds42' -version '2.1-SNAPSHOT' +version '2.2-SNAPSHOT' sourceCompatibility = 11 @@ -116,5 +116,5 @@ githubRelease { repo "Coverage41C" targetCommitish "master" releaseAssets.from(distZip.archiveFile) - dryRun true + dryRun false } diff --git a/choco/coverage41c.nuspec b/choco/coverage41c.nuspec index a4195b1..767fe94 100644 --- a/choco/coverage41c.nuspec +++ b/choco/coverage41c.nuspec @@ -9,7 +9,7 @@ - 2.0 + 2.1 https://github.com/proDOOMman/Coverage41C proDOOMman diff --git a/src/main/java/com/clouds42/Utils.java b/src/main/java/com/clouds42/Utils.java index e609aac..5a3c24a 100644 --- a/src/main/java/com/clouds42/Utils.java +++ b/src/main/java/com/clouds42/Utils.java @@ -101,6 +101,10 @@ private static void addAllModulesToList(Configuration conf, MetadataOptions meta Map> coverageData) { String mdObjUuid = mdObj.getUuid(); Map modulesByType = mdObj.getModulesByType(); + if (modulesByType == null) { + logger.info("Found empty modules in metadata object: " + mdObj.getName()); + return; + } modulesByType.forEach((uri, moduleType) -> { uriListByKey.put(getUriKey(mdObjUuid, moduleType, mdObj), uri); From 4d18718f6054968e127456fde6560295c8971adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Thu, 28 May 2020 13:03:25 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5d99988..b2c1778 100644 --- a/build.gradle +++ b/build.gradle @@ -56,9 +56,9 @@ dependencies { compile group: 'de.vandermeer', name:'asciitable', version: '0.3.2' - implementation 'com.github.1c-syntax:mdclasses:42fcc53f34b08a7a748528c9dd53ae1a2e04bb40' // TODO: change to release + implementation 'com.github.1c-syntax:mdclasses:0.5.0' - implementation('com.github.1c-syntax:bsl-parser:0.13.0') { + implementation('com.github.1c-syntax:bsl-parser:0.14.1') { exclude group: "com.tunnelvisionlabs", module: "antlr4-annotations" exclude group: "com.ibm.icu", module: "*" exclude group: "org.antlr", module: "ST4" From b7e91974ee4723e6ae0a0b2fb879ef195bfced53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Thu, 4 Jun 2020 09:07:23 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=A3=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0?= =?UTF-8?q?=D1=82=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=83=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/clouds42/Commands/CoverageCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/clouds42/Commands/CoverageCommand.java b/src/main/java/com/clouds42/Commands/CoverageCommand.java index 1c2d163..e4b24bc 100644 --- a/src/main/java/com/clouds42/Commands/CoverageCommand.java +++ b/src/main/java/com/clouds42/Commands/CoverageCommand.java @@ -1,6 +1,7 @@ package com.clouds42.Commands; import com._1c.g5.v8.dt.debug.core.runtime.client.RuntimeDebugClientException; +import com._1c.g5.v8.dt.debug.model.base.data.AttachDebugUIResult; import com._1c.g5.v8.dt.debug.model.base.data.BSLModuleIdInternal; import com._1c.g5.v8.dt.debug.model.base.data.DebugTargetId; import com._1c.g5.v8.dt.debug.model.dbgui.commands.DBGUIExtCmdInfoBase; @@ -295,11 +296,14 @@ public void run() } catch (RuntimeDebugClientException e) { logger.info(e.getLocalizedMessage()); if (systemStarted) { - logger.info("Can't send ping to dbgs. Coverage analyzing finished"); + logger.info("Can't send ping to debug server. Coverage analyzing finished"); gracefulShutdown(null); } else { try { - client.connect(debuggerOptions.getPassword()); + AttachDebugUIResult connectionResult = client.connect(debuggerOptions.getPassword()); + if (connectionResult != AttachDebugUIResult.REGISTERED) { + throw new RuntimeDebugClientException("Can't connect to debug server. Connection result: " + connectionResult); + } client.initSettings(false); client.setAutoconnectDebugTargets( debuggerOptions.getDebugAreaNames(), From 6413b921e74b4007e2e4fb47ceae8aa421141309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Thu, 4 Jun 2020 09:07:49 +0300 Subject: [PATCH 4/8] =?UTF-8?q?WIP:=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE?= =?UTF-8?q?=D1=82=D0=B5=D0=BA=D0=B0=20=D1=88=D0=B0=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/step_definitions/Coverage41C.epf | Bin 10066 -> 10577 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/test/resources/bdd/features/step_definitions/Coverage41C.epf b/src/test/resources/bdd/features/step_definitions/Coverage41C.epf index 212130596e6482a935a6b867c50c2d91af24fa1e..c5f9657a72aaf98ed90e4dda20fdd6b1c8060ac4 100644 GIT binary patch delta 6647 zcmZ9RWl+@%w8anIAl)h5C8>mT2uDDqk?!=+@uyR|JEXhMp;5ZKyE_EwdiTEf>D@K6 zX0Q3}&wFOitSOaAwOBa;21*d9;2*!fz5?CUAP_pu|78|B5XkZ$|I0(^L7ZXS|36C5g;!0GN5TOFjRk19{}Io>LD2mFM1zHX z`oZQqet&X~Q_^d9qFQs@v0|NpFX~5EI1~h%E*k`7H5SE~Uqo>XDGcPxEM@L1L8jdX zc&u(*Nw)4gMK@}+F?Bl&|n{f#1HULvGw4a3PR+tJzo-4pIKUsVa zY|h)6xY%&yHKc%LQ&5qRDP!*=M@R))x9BkwIygC_ho{~oG_5vQwofiCxh)C!*jsUJ z0^XA-tlQ)fyofN7v4>g)M;A`{4nB zREtahcJi$aLtf^@h6}lQ?LUxoHjDJnK@Tcn#_b=@Ema$cml!Rlv&L4(5M;cthajqt zNQp^Hwfgdj(2vjwA)pytrE!S-KmX>TcZM>ykotR zouuNS3{7`yxcP_lqD+6c?6%8wMG*7ntjq#8e4zsk(G=O8Hcs7Ro`XhQm|cpmz;Ip5 z@+58IJ;O_6diisCNvk2wIE1+_STOieq_D1JN>HOhlN_Pn#27IM_-g@cOIK@P%6bH! zD#7ad;v}%<3Q`O}u~=d7_8<}zG!{19j(VOik0`#9HC_I#pD)nT+pzxH(sIxZQ_*zW zD&~V0-E&^wq+X*}orB^Q;w4J&Pqlvv zG){B^y$z;#ZU?S!wQTKr!m`uHo>4b`6mTVNMd?fbgW7XR>epis4*9x|v{;UqdhW*< z%SO<3q#7@oEv9G*CD5 z!ToRw<+=j~7vU(WNe}Bi0@t#o=GNqdk05MkxqjWDB_bNS(^meP2!7PD^m|?}3H+zn zjv*`uw5G2D4$`{k5twtA@S-~c>$wo^ufG?qk6G21paasdhM~o)b;N_Xu(=^d@sNlI%s#F-Fca;Vv(jFYd!&D~*rsHt@XLJ_IzOY9a1>K^ECNf4)IoU2ZvO_EHn*N?b zS1{u}LTOq;nxxd-O)*SA<0NEay=r^D(n!y?b6L z@sDaI(FY9pq&h66jV`taEQk=>9;=N6BH&QD{GA)DQ#^rEv2c^?yAU6DtXS%05(TO( z*Cr~i(x7{P4{==Le#GeBXrK4)H*^6nXV?A>wk2fpdNPuoQ`-(FDGn%hOXkTvqw@E&JfNXP znpnsDSmpgxyvz}?=LgiG-aSBCWZpU`$ zBq+x2;MMXj{fDltKLtDf?b&>3Hnu71oIUs|xpsAJY*(|Qs#^Me9;fK! zUT9Qo(-?=hN77kvyX(zGw>10lnIq5(lkux)V|tQLig0LNuP^5Mz(n81m!19P=`zbW z%pPL`pnS^h`74qf@|v2lZp^}(E>3%APew+1$LTT5WNPb2XtISu!*;%DdE;0FW^U7; zee&n}DnWIW%zlAttmULrZYQBv%$#VRTQS%h28yUycMfQ9r0Cwj!Yv6%Pz18U2->5m z?N|Z2g?<}V#`}~6#`RwvH@`cve$p*&#uuPvKFaFQk;pvlcae*L(Fav3qo$@I+;34B z>{p?RkF8dF)USq)c2V7|-yzn3DVWByH_c|KEcZpmI%dk`3*|&;ghxloq;bL$nedAodA=%`-iZm>oJ;4c?sU?Nn}MdYbpf{i)t*1ZdgXy@ zt4)Z0qtexzwtS)OeN1*xr)K77|E?9!t1qb7Ya>k7jR`uO6fCATU6k3dXvFD z1{={)KOEiRh2mHcX8^(^tzTj`RPAMUS4pn7?|cG$=Fx9^(9~p419Yjrbv|zzYK1?b zm`D^MW5O}%)RW_U|_5S6XJ#C#Kh|GrUVR^gD>6@`a3L4Mlf?6 zC*&@FnFwQ$^!hCc?4F`lv_}^Ui~RmPqPt#fw8VIv)2A9^`3mGN;1li%TTK&HO4e3K z`cPW@>4}j|2-;n=EySs;D|mB@O7!RmKav^RP3Ml(Rl^Nwp|Piim9W%WjUw*!fPd2 zf&K%wvE&G_rVJIRr))NgcC)fFS$}C<`|V&6>GI9Dx6N_y$?3r|QAN|{Xi-+CHz(of zec0eve%E%~t$5d!NV@DRJlk(s<8&FpXa3k?^Br&?ZXhf(tHv<7L z%uoaeFIj$-1M9uE`fRg%pP=8~()e#~$n7sU7Y|v01E52mc_WK*GN&LErHGl5<;GxQ zHrL>weTIF1fp;)I!3`z_H@xOcm`)F{v^8LV)ABSIFEHP)`{K$Of1-wS>Mq1SJTM)F zX64lvddg4JmyiP8Hg@yf|ME|HKX5g+7JJ^BU})z+SN`Dd&slfq_n*oD=aXH&(fn#j4ecgZV3FeLI

FyktQwLTKI22DiD{Q#DyQ)U&@vRe*?DO+n{XNpG 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 K0l2uh?f(Hi9PQr# delta 6136 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 From 709f999bb6173a6d9ab0d29792a3cd2bc5d018f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 5 Jun 2020 20:54:36 +0300 Subject: [PATCH 5/8] =?UTF-8?q?WIP:=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE?= =?UTF-8?q?=D1=82=D0=B5=D0=BA=D0=B0=20=D1=88=D0=B0=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/step_definitions/Coverage41C.epf | Bin 10577 -> 10597 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/test/resources/bdd/features/step_definitions/Coverage41C.epf b/src/test/resources/bdd/features/step_definitions/Coverage41C.epf index c5f9657a72aaf98ed90e4dda20fdd6b1c8060ac4..df0f219999c699920e2f4224c25eb2f7dec7abdb 100644 GIT binary patch delta 2326 zcmZ9N`#;l*AIE1=7;Qk0=6REibT{T&v?kcI*|<&ZhPcu;+h%zxO5d;(Rcc&t_6X_wFd>&*7#q z7J*#LY2x-3_Vv*FTxmkF1#TkA`|eQ&L9Z9(P8BH!8KjLA!#+kIv+nVcC0F%vVsU0{ zIC93g&l(LQjq~DYthkBu=8!wh@mFEqy-&*S!6w{FIVfBr)C&+@zFy#vszmvtaHre? z?XizOUD&1Xq)-&H{vuJXTIDX6r@9ok|Ng~RuXoKX7Zx?^7xnVpxrP{(PG=ReC~;PV z4HF3G0wEALv;LaD)wpz03W}XDa@ymw(?2+bBxrzNf*_ZI)RM1N{WMFv6?WO1T@azV zpF_4RfODM?uLU5A4(05v>ie0e#WMuf{cuGuFReRi?PRm$1=!TD8>jVo1fy?nP9hAd zHKlE@K3RnC_U-oGjFmSNPI*cZWNJ4b1kazm6Q>dU?Q7d!{<2Sq`Rb;-^g@qKNetrh zld@1!kZ9{2JZ5GO#9A|)l#a_h#E3^;fA4b{SS-HjWD5v=iuT7%ai6MvL@Il+jDqcq zqiTdB`h;ygIvyXFm!x@~=O5@*)YeT2Ir6jGGr($XH^So|iR-zY6?ZdwlPUdUBp`;7 zH7gZ0^r7(s4JI zkcO%-n}Cxy6Z-1?pgX;ozB9TPs?^m7lWXq}85#MNCaky`KTT@j>)(f|WpdfdSdE^K zw~b1FpcN-@M@If-`JGU|Da=#$vLb(Q>+G0kZ=d!)Q_xzSBD7|$JNGzHAcg1FUww%7AI6SG8Ok89D>p%0y@YA zhT%>$QZwyv^gsUH7`m}#L^u|@dgu>4@uxGKn~Y!w29qyUHwQTaATO3~UoIEhCDaGE z>|_S|EE9zYZ$8K;ydNO$w| zEHex4Wp1oNzE1ilgaaQtp!Ivt1@%NYwyIji+boXXM~cOXvPF)}UM&}xJS9n`8-70% z_2x~I{P{n}`lnEheP}IvtAtahG7oyRU(q3PLsWD{=4kc7!kDX?dOo1QHOu^5I_$kD zPt?vun}BJ^4X;h zTQtL$+Ej=0BThp=+MGrhzBWoig{0hho7nVaC}%`K1#h!*#xySt39b$fsBQou-YAra zNUcctR1A?hF&+pDi<+_m&u3A@FU-~U9NB5|_Wn|V5uMiec4y-6{$XyAW(ctq*WJdB zcvmurO!1KPlqnM>J@%^6c65+-F3y+r*r^MAPO?7NNdtsOim`GO=h|Xj)%P+fJhg@O zC8jktrmCzE#4G~h3YE1fkpt(PsIY=0vUHAv$gOkjra}1Wnxu;FeZvms{teT{Xe@}g zl0cy5*bJN;$c5bKi}DC_ZCBRhLg=xY6q>md$jwU8-_g)oh4i55ol1qbj92>3`|21( zmvsja*ek7+ohZA7Xd5R7hP9`6XoWbks@ONh=<^n9EA~V`){~~o$YSu@JVd*|9D2;` zG@XUlIc#e^1+UIBn*)L7Dd2|Q(XQHva%PX#3L^8f5kfr^STx(}z)-yGbkf8Y<7;1=A2$7)7+yo~9JdF;UAPX=XRv&6O{*LpEgSnZ_b=hs)xEv0e{pGmGFQ+>wM1H4?x zy3sA%yaC`s!#$sp(C}x%^WTMeI8;A9KS5iKo$tDydWm?bSBG?vQNyI(zdb5GG0CRl zt_Uy#NL!qaEuqCdT0J^N4tp`M1T?MHLZ9AfT4XPOO?_;MCU&7Ak?p670=NIIceL=X zqtLKUi)S-4b7HWEC`ka~`%xrxfeSC;TbA3pa$x5J9my`7Z8#B0c-R_(kQf@Yw!xB) z;QpIP%1s`)m*H908C3>NU-83K+2;E>IOWA*+EMX%OTC(|$mh{4iTzQJ L?jvwU#^QegLw{x- delta 2305 zcmZ9Nc|6mPAIH})C1;5=cOgg4L?rjo^fgz*Y-H}fNxA3x5JDmwb05jAaV%-xF*h)O%n{kpnsF-2*!c`U!^&M;b~@UyeBbN z#Fc-YiU#Hi(Uq->7wCEN5=SXoymVcq#K3tiQIhrMY$#f6@12Ey16kBpcKyP? zTRaoDxlfGeWyV%0xec0fsnjc?7SB{P&fLltPg3cT>Ru~>>jCbXGCX8(#i-orVj6jIj#>1fsMP3;?@hutRUb`nxL)LRCd*V*WHL+G*jCk=YJGz6366qJ zf2SwCx>H=uzKhV`fi@ZnAA3Ip?#e5}sG)VK>$Xl-ksvlRuE?j}ofF)fT1H})$wtMwPtFmaU|++u)USUgTe_0bH@ zqk34hXjL=7RJA+0|MWzZuhBOy_Ln31#g|FiBI`x!FMxAlnnJejd+|plg$f?RHDs2v z*Fv5!yYH>e8#+oZ*NJ|}ag}xfiMtq*G3WOw52EL&ZPL=t&O3SPwx^t<;a>tr{!?Pj z(0&+phiNZpcJcn<9A98S|IbIZP>uX1!VnEsEUM~(PfrpOa44=cq}h>@c3dP%I0|9Z zT&SA~0%&t{?`mcq6z|t%`g)n zA!);%Cw0`*S@=MWI4vA#1Q%QA4m6D&rDpGmd?Wd8jwQ}dBBN(U6B$^yqAm@&cEyJq z+Fr{(3HM1o!+1f=1s?eYr*zyi9{!3ET+QABmJcqI6YtlF9rd&b-#a5``f!*!(yTWQ zoQ{x(Pvh0+KZ`vXc!f2!NN{{66%WWuo~hGSDt$4APq$GcWoi0%-E+9i9Rk(kyZxYN zpt_|UT^KW!m4jKB2U1L<@dJzb*K{@~tw!m=wsnbZtM>(EtzxhJ-GQf!j2O=xyP;kf z@u*k$!=60c0g3g#LE)%0TaXyM9vE(&*}L!z8*1YfL45(4&u~({|Dj5g+a1{aOtsWi zE>3B0n2JcWziaUB=VACO;4y_XMi{;BI$pNm6QB^vjkDryx+z6s#1csSgW~AaF@@QP zvNz1=2S__;?(>Pzl0A>Bdpb`CU>7}bM|wX_8H^B9?6YJGj0Vg{fGc?8f&V zy`73Zcq6EkC)}W4FPHLt>Lmc)XpwF_7>ea=SZezx7XS4^dVsU@Gg72>{~qpN!Q%xR(hixZAB2+91~>x-$1GJT{KwJT0{CwXHO$v+aMAbm}bwXSKV ze&v~&yySfLW(Gu#;D+cDjE4}LS_51r5WYOOETF!1Q+2Eud{f#L-DrSgmx%6ozQ3kj zim?&-Dkgdk$q*Bhoi?}8D3>Q@W>AKPF>@x(p+Ty^dH^%z)#b2XpXuc@IS*?No$G67 z493mPZ^I5p6QSmU)lLOwTbrBw<&b$geF}u}F5>+3xLmrAjw93Tf5IXc$(>MFrdoC# zVJ?oC76-3J6=VTIxmqOq=J0Sn%hDv9I5v<<(9WpdRShfozXTAxaxB3` zT02TM*O%a5Px!(p9kAaV#b7rv%#F%ygm=JgdiVhf3FITIBDVtt*-hsLzs{@)Q;dq03=^OhiA6@JME2HXfeZ>IZuDCv zRT9W*!gFyxT$zqO0bxD3A#3NrcP=fsmWY3$z%$*g$P=~lCCSrQ`0a^_YE)xmz$7fF z43V>I`OM9uG^DkJweooN53rn`u7x71)9Gajy!?pX9#{J53q3J+<;eM1JAvZq0kg^M zvr{T`5IR5hp(#WqOct&G_H+J0@rx6~x~t%&qclaZI2Y(+!qo2p{Wpp3B7Y7jkwx6$ zk4+_dOIrP@Ixg7#q0;1Kv;mw>N|wrTqh;E#(S+`V=2@tB?!oi1i`M*fH^*tSCWArg zz}@nWuPd`tTktAt^U98q9HO>3iNzHeMf0mom30YIN7XY3ST9M&$_c{}Rz8^)WB#Iu z$+@}b(hYES{vl?GZrv3|MZg+bC From c627992cce3d85eea76f7d7f00f2d9b827cfa76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 5 Jun 2020 20:55:06 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=94=D0=B5=D1=82=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=84=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/clouds42/Commands/CoverageCommand.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/clouds42/Commands/CoverageCommand.java b/src/main/java/com/clouds42/Commands/CoverageCommand.java index e4b24bc..7791f6d 100644 --- a/src/main/java/com/clouds42/Commands/CoverageCommand.java +++ b/src/main/java/com/clouds42/Commands/CoverageCommand.java @@ -302,7 +302,13 @@ public void run() try { AttachDebugUIResult connectionResult = client.connect(debuggerOptions.getPassword()); if (connectionResult != AttachDebugUIResult.REGISTERED) { - throw new RuntimeDebugClientException("Can't connect to debug server. Connection result: " + connectionResult); + if (connectionResult == AttachDebugUIResult.IB_IN_DEBUG) { + throw new RuntimeDebugClientException("Can't connect to debug server. IB is in debug. Close configurator or EDT first"); + } else if (connectionResult == AttachDebugUIResult.CREDENTIALS_REQUIRED) { + throw new RuntimeDebugClientException("Can't connect to debug server. Use -p option to set correct password"); + } else { + throw new RuntimeDebugClientException("Can't connect to debug server. Connection result: " + connectionResult); + } } client.initSettings(false); client.setAutoconnectDebugTargets( From 6e474cafba0a6c8cd4a00364d3a945aeb9e0de02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 5 Jun 2020 23:56:50 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20nuspec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- choco/coverage41c.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/choco/coverage41c.nuspec b/choco/coverage41c.nuspec index 767fe94..0380369 100644 --- a/choco/coverage41c.nuspec +++ b/choco/coverage41c.nuspec @@ -9,7 +9,7 @@ - 2.1 + 2.2 https://github.com/proDOOMman/Coverage41C proDOOMman From fab27ee7b5d5380a71a524246d9577c8b34fa599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BE=D0=BB=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 5 Jun 2020 23:57:40 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b2c1778..1056f01 100644 --- a/build.gradle +++ b/build.gradle @@ -36,8 +36,8 @@ dependencies { } println 'EDT location: ' + edtLocation - compile group: 'info.picocli', name: 'picocli', version: '4.2.0' - annotationProcessor 'info.picocli:picocli-codegen:4.2.0' + compile group: 'info.picocli', name: 'picocli', version: '4.3.2' + annotationProcessor 'info.picocli:picocli-codegen:4.3.2' compile group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha1' compile group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.0-alpha1' @@ -52,7 +52,7 @@ dependencies { compile group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.4.27.v20200227' - compile group: 'com.google.guava', name: 'guava', version: '28.2-jre' + compile group: 'com.google.guava', name: 'guava', version: '29.0-jre' compile group: 'de.vandermeer', name:'asciitable', version: '0.3.2' @@ -74,8 +74,8 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2' testCompile 'org.xmlunit:xmlunit-core:2.6.4' testCompile 'org.xmlunit:xmlunit-matchers:2.6.4' - testCompile 'com.fasterxml.jackson.core:jackson-core:2.9.6' - testCompile 'com.fasterxml.jackson.core:jackson-databind:2.9.6' + testCompile 'com.fasterxml.jackson.core:jackson-core:2.11.0' + testCompile 'com.fasterxml.jackson.core:jackson-databind:2.11.0' } tasks.withType(JavaCompile) {