From 569b765e5955842b7fac699a07c11ee6c9c04a38 Mon Sep 17 00:00:00 2001 From: Zan Markan Date: Tue, 15 Nov 2016 13:59:16 +0000 Subject: [PATCH 1/3] Point to snapshot release of pusher/java-websocket --- CHANGELOG.md | 1 - build.gradle | 8 +- gradle/wrapper/gradle-wrapper.jar | Bin 52141 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 52 ++--- gradlew.bat | 180 +++++++++--------- pom.xml | 2 +- .../websocket/WebSocketClientWrapper.java | 4 +- .../websocket/WebSocketConnection.java | 2 +- .../websocket/WebSocketListener.java | 2 +- .../client/example/SimpleWebSocket.java | 4 +- .../java/com/pusher/client/util/Factory.java | 2 - .../java/com/pusher/client/EndToEndTest.java | 2 +- .../websocket/WebSocketClientWrapperTest.java | 2 +- 14 files changed, 131 insertions(+), 134 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a431fda9..084b9665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # pusher-websocket-java changelog ## Version 1.3.0 - * Add retry logic when the connection is lost * Accept 201 status code from auth endpoints diff --git a/build.gradle b/build.gradle index 4a583799..2f88fb75 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { classpath 'org.ajoberstar:gradle-git:1.1.0' } } + def getProperty = { property -> if (!project.hasProperty(property)) { throw new GradleException("${property} property must be set") @@ -13,7 +14,6 @@ def getProperty = { property -> return project.property(property) } - apply plugin: 'java' apply plugin: 'maven' apply plugin: 'eclipse' @@ -39,13 +39,13 @@ ext.sharedManifest = manifest { repositories { mavenCentral() - maven { url "http://clojars.org/repo" } + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { compile "com.google.code.gson:gson:2.2.2" compile "org.slf4j:slf4j-api:1.7.5" - compile "org.java-websocket:java-websocket:1.3.1" + compile "com.pusher:java-websocket:1.4.0-SNAPSHOT" testCompile "org.mockito:mockito-all:1.8.5" testCompile "org.powermock:powermock-module-junit4:1.4.11" testCompile "org.powermock:powermock-api-mockito:1.4.11" @@ -186,5 +186,5 @@ task createPublishTarget << { } task wrapper(type: Wrapper) { - gradleVersion = '2.0' + gradleVersion = '2.14.1' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 085a1cdc27db1185342f15a00441734e74fe3735..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644 GIT binary patch delta 22323 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 E0ZZ2@@&Et; delta 21190 zcmZ5{V{k6dw{>jWJh5%tc1~>D$rIbQZQC|aY}?KW-rpZp@4ffaUbT99rlxDASMT1d zr}IH;(m)XuWkA7TfPkQ&fJ~Sa#S;+7;QtkkUSCuMfPjEh69iS!9-Z!;fPwzcg;hjg z|L!nH@t^p?@b8#J2fX)h(1Z-)1o9s$4D94Tlp}c2f2bxbC=>|ffAu%63+OZe0RlpT z00N>*Vv@&5(i?_M(nLT5ByQR*2_l7>CvnQ-bIcad(VYqw#Oho?v;!%rC9~rd3n~fg zL}X1$MPE{{C0zRts|1J!4}&B2ix8Ww%4gByM!?QZ&&~=wdS2}U{Juf_xp@@@1GEvM zxzdB4@oW?UahY;fvR17ouM{u|Cilny*Y>0C3BX~+GT-8khI(+6LM}>5s;QrLe5fD&7NLcKZNRmeuU}6wcGa{$W?3zj1fWF znTDdT3J%%}wr_kuOFRSh`4U@l%V0~SzOCVwofm$JqH1^fj}DC${%zzfvN?LSuYg`P ziafzVRxxchZ}XSod`n)JOB79^nyoTD`lR9je2>NT4F@ho*tPiO(ec1#D9ocG5u?Bk z+t;507#uWJN@bNoazyHYmY+{n&SN7~$Q+g~Tp{!y8So!~0km>6wm21cx+mTJ$Z%Tv z9B9F~1?HVgv}fRV<~?Y*l6(x2Z88gKyk@p(!)MF{<^ugbk)R<2DLB31rD?SK9WdT3 zj-eYi-whl+g^29alRR^;$jzl^6RnJ14wB620Zn?`2#;n?;qvGQloKW;%+!vkT#Bn^ zWK|*p>tqw47A&C_R&bGbyb|dMA{NQN*b@n#tp%ItDQJE`jW~Qb$OcNtE<)%Rfe9?z zGd7Vnh?5Rf;;|3`jF9>Wkru%bvK7G`5EVI*doU3*Vj~?`2Mt7mXM9=tdJeF%wBSm* z_z&#={-l+B@hy+RfPk?7`5hR6l9=Vuljx8M0hi9GYG^;UStdhnQ$>o>(jibFmLK8% z=r%Ca^U@`VzZ7W$JLT+?LQFVp*qhPO^WMb22H|3dH2ArKhOqi)$K8J@pWQhMW}-IC zyl#3im-GhVfuiWGm!(Cv<V^fkur~!f%GT27_Rvr8wFnV7hDqO4!;LwwL*0q&Wt^tjcV7+QtM&m zm6P`_yu@XmWmNFHgw8l>wwxEo0cD zXfCy2ex(K-X6mX?JXTHI>WnN+jT3H&Jh9ior%Qt{<~GKujd#+nL(b91;RukPQo8uy zx=Fw@G;8Vlq5DRFVu6hsBcU-8{&`1y!pb+vv9b1o162IHKrNrpIaj=X048w9;GVlOq{zkwUP<33m(_+z$uaAvDF#=zuYBt?O`8nK9ul@fc#`tHY&o8n zZXa2_Py9KLAfIw6o~*|^fEHOvXdFjBS1M9%aI~Vp6J@dz*<&ac(6}TapSP-7NxFtUQp#o&R{cN)9OBr5QKi3)o zwykDJObhQpBC`6VoHsm&bY|lF?N{Ch!>JN*Hiv)KdN>RM2cv!xK!kU0mwvpDoYILu z;bxy|RBitvjz9RJi(*Fx=PrG-Ax@QniYU;o_7X`9vBjdA*B?>n;agL9=}Ck&PAux~ z3j{FtMfNrU70n=&Q+m25YOjxc`Bt|b#DA8Q6@NRy7fg|wufR}{vT?b|j@FPs&yK#Z z@`{v|*KF$<{1UMPAZg_n4+|91AAiN#MB5sG?to1=zJ+~{I-@oEYe0lXS$K)?5)9Hy zl8dV92U6|(_ zp|l+p7ipCIA}oB1UiuX|mH=dN?itC;5?w4i`|(JZq;mBfa8EAKYUjAMJu0*{BGaxg z1Ic+6zzz9s_(y(OKvoR1*i)V~+Pg0CN?*b#%4tGVcv(`Bre5a;YZxC#FQ`M)Q`5>LiX^`=|& zNRWR^^{mrnBswGzkR1XL5P1@^8flW<5CkAa{oNQ>1NnPp1>G}=GtzmjCCG>(hISo8 zN`+Di^=?_TrtX7Uexu#mn$({9wzI2hIMfN1^3@j%B>67{rZ&}ZGqB%L97yl_Z=F`^ zr5DH^j$6x}X%3d%thS%;xi1dj?9sjh&d5Q6>=9)=2)kjb9wHH?&|^y3^;VMxlo3Fb z6OgMeatX-t@EG8eB6Z^5d9IRg4 zvDZ7_0Y{2Z!r?m+E>DWcE*OMp%_xAjJOwyMK z>ChvK%23i{+L%PxX;~?SvvC^QFL65yjusmw7T9$v97fnv^eg;k*|B9=cXgUn7x2I2 z>Ep-Og?}hw_XD_DKTC6@Sp((zDlozbXo?DFYuZ4l5s;||7^Z9_3vW;)# zp+95NQ?Q+UHFRjM_Y8aHY@6|}_1I2naD_K`4OhY|?kPQ{)-*JoIXUxNC4S;9vT|9m z2*qxl81{c*JG)p2A1l0CbMMW?y|*coZRA|$-1}-)QSGJLk8B*f(7|12{k*9ak!RnoTentY=ZkPUh1HY7a|p z_Isu}4=uob$0^TZtMZ35oSsG!ZQHHa7p?&+0^Ri|Fg&=m2$YIghXuCkVH%jvDMSLu zW6lGE8y}6XDujBju1oiec+5Rll+&S!#1|i*7?l-wH)PF^k6$!E%rC$o^vrIk^5S}NX(J>vAMm%{5M&eZA4#%i- zhuF}aJ+wzuunxs`?6gJ{?jj?>X&#(>t6<+sBK0Gl zth)>Mrn}7B*WTpN`qThS0cBd9N%AkhWL9;>n0g&V^j(VHaw2yR5xd`tMB>EnCC~wb zd1}>%YUqFgee`AziPUp?9s@L|(ke`_XX`=-;5yiY#=s!g^!)sqP981h-^NOBN{`9YB)5tUYm>K%6>|6+ejAEYZVm0KZjFUT_Q{CfM0Ej9HXtev;Jc-qz;fa+ zn}*F+(>Sgu3CiEX(9S@X33;_iuZrXoWPd4Mj0g9rx}5l?d;2ub*j44u_3NB zw*$vH&{cGz)v4v)S>PjUnCS`K@^tP2_Z9!{SW$H#?y~B%#}{e(1~(ddV1j@p6aj4a zb~lZ!KGyeaR&4@Qnt~FuC`ni8vVv9a0=N_O@GFiTzWDFwe=N=X4ktY0PDqS-d%VTn zuS1#6nf*lIN;*r(#HDFGXG%I8E-w5^**5yty)ILGnCyj#1IsyzCEE==%0OSb<$F>eB)&#mYu^%mVAKs+TekFQ)uZ zC~Tt899G?cnWGLrcep3*yTqFhzC7TnsWsro9enLJJJST*)F+v48Wx;Bi8SII)H%bJ z&?)P@DhUs;PT^dLhHsnvq$}%!f#IAmKt%!qD9Wii9hu^1yJJHuQ+$KLe_0-LzT_`8 zxvZ@s&_)1$)q@Q)+P<^@$S5eywk>5ag+cY4>FA? zb~X@N;u)qwE(EEWX$W^+1?|9Gv(r1q=?=(@H(&tZd0kNzl&y}mk`y+KWoL+K zudhZZOQ6`^x4#D3cqu6UqS(IP%~K|=@UJZCh>t`(&SbJZp99wO9OT-(^`m!EM5}mynNog! ziMmzIAkS=~*ozSS4PowJA4TA89svIBqvlvxN{bKLZ4;RVpa8XDz#?zmimY!sjcI=i`A~s9q06n*%pM4qI z%hK9#4{>=r-j6%4y?;G+A6jk!?`$L+vzUNDv@#BpH)rf`;ZXY&qc<7sZ)yG?Zb?Hg zl>&S3@V@sHqLfAVqboY>Z*ob13;?tEc5xT-9Qp$iySHp!0D?;N=U4tu^?YCQLf>K^ z)zdBT2V%%Ki=^w5zEEZHPwLkX^!(4{CjjOP5YN7tB~+PzJLLchiaMJ<0GRC$~aXDX!bnK5`QWL3fe+KtCjhm@Yu2m|hkUZ>tJyw3)rgvkQ5p?B4wL44Tm*5|)XQ0p3eWe(}`MsR_9A>doW$LI9=wZY}V>Q(+Ty&qcynIYU` z-XhVG8k~w}i(OAg%GDWXsg;%?yQ#g%UrNU8<fgb4YSPK~nVQgdU#ug+h8GDwZ3v)qlx>20pSAP4W+I(wuB9|>kRt)U2^vbRUH58BXwA5x zrXFx~4;7M#UWhJP56#%pIK|m!)DfjHirgP`F74bD2ah-)vd0#|ekW)~kv*pWD7I^Z zBZvSoF%=fQqW4#6N8Rj!ZOiy$!3>Q94L=zK;`7$a3gLcErs50U73|=;ObKIs}%r9MSS0I$D(thi1amuV*fbv6NRbB&_%l)yXh$uw0P3Z}qxx|KVV z!gENj81650>Bo|@as!MmV$v8Be~?V8mAH19D-+JHk<1xx<8UlmE^uWV5Vsl&qd=;? zf6Y#hhufXslXhab7qQ!p&A?qLD+zx1TgF(oUITfchBNO;!4n&!VO`dnN`JbWMF&Sk zs4%`80dXxno(%{;Defq|9M9};g_8>{P8Qqn=|Q2m_`c+GApm%%w&LiWeRO3=*ecr% zwS9?#S;3BR&JV>=GEkMhtuEyS1zEQ1CT14fbLYthYe+Id@)Kt{vEe@tqTt^K?y!QJ zTsSu>lSUG|DCoz1GLE=F2kmJu)N@mTO1t^ z@e)PA{|avqp95kp6YJ0htR>?$Fbr;_%toJm?38AY51O5ro~x_q3E5Rt7EFM@PPj5) zUS82pC!gDnc#SDenXWxD0ppIs{kfti55GkFgk~0eU9GKYRO}a?vZj`0z*AE@LQpM#HDffiMY7i@;E*5}3OXSVv+Su%d}Emw1;t zB?9F38OVl6A6-%y=Bag}2d`?RR)38Ip5v{33RgAK8Q|{pt}rjVXJm+OIo3bXiHhCu zX3w{<;tfZSqw4Sy2SKGrVv#0Lv7lxMu9EV{14r|fN;H16Vuk#rGVA1uXsmV+KbG(m z-j_-#d&{1TyFcX2b%<)8yxo7T`~(xIcmVtz2BwZorKgls9%S?D8zfYG@8+C=d>7$r zVW@1P79hj$(q^pHvB(g4gmF+ae8V7!P|8Kd_0=rVFVt6m(@GH-+=c5t=#!A6Mhc_j5a9bA2r#J1Izz1Lr2D0##RCU_wApsFv zkqV_OGUxd_O8O|;{S}Y3Q!G3hUqSv;ZIlb{y7MQOg2@-FjdLThg}3};=kZiwEEsz6 zZZepZlE03r-GnZ{(~cjjI7#{?U!%)xcrm_6y)UCy2ak}V!Sz+ZSp9(Fbzt{hPG z8vYIRbe81sZvpKPOBWl3PPG+u4~p)>z~rrX=PJ%rgcrBJ^9vm&W2Z?8htK2OA3_aNU?f`uHDR`+VkcoBauam~gzcU@9e7;&m9 zwJM`SD!W%H@g7+bx`nOH&tfk*e?x)-xV^jm_8U&AZ7BWuEwi=%6B zVjl+na+sDBr88f0b=UV^FK^U7=sTE{i>mvZ3nz$w%PgnFlyQf?t5kmrkInskTa2-1 zn`P=75PBn$^#;I9=Y<;1D$?+Yx*Pf;ZfSyXLZxeKOXUG=`cd`<(9a|8`=Q$wDJ&w2 zbn_5B#Tk&5UXR0WB%reb*^uZ->G8Usa$S9vA7TlF3N&}t4!prDQjL7;IQ-3wI_lw- zL2n41U%}p38T)Ed#eLK->P)9l6+n6n#ep#D9ksN=O9vE`vfHom$j#XH*4t-l=a$hq zNdC~a2y1PM@RV9o0J$4xmToUKpQ7NWm-IAfb+VA(xz8wW!d+Vrg}CXqcgZ0?U&pn8 z>y=H`qjZivhd3A*WZv-kosYH+O|t&82rgu!U#F*?+A>uDEM2NnzcI?qHau>wcQfxdns1b-jyGMOW z%70_6fviQI-;Qv3!v3Jr?11O(78HP|0U*@pfdlXv?j|qH@h|~2_U~I~NMOaF|`RBf$W9oVYvo7#o ztpK`xpxKn$9drBhIdh&MJR41+|24?EqRFN;&Lozh2T1RN{xz>0}P?Tj*E#*(_P zUAeBJ53Bx144_d((W&nB;T{enA-vDP~;JF42;bxEd7xB zRSSGcQU6w)aOYT{Vowa~GmSG1e84|(mB|0sPs|hd7q=#@L^oi0qRbOR1MH0B%vy`# z1~?kBNqN_QvT}M^wJ*q_MuhPoaNgbwn)*pcD~IxFQ`y%4!Trp=iBgAgDnr!{;22y9 zyGJs7yesmHq4%n*XR0qQcu&u6DztaEVsga3tKfQW>cHI;IM;rW5N$|BJ)YhUagK12 z(DYhBzk@6-ip0zNIC2PG`zG#OA(Clg#Bn!R>gu}!^v8UBD-m177QRD%Kz4x(E%x%?gqHa*grX> z5{*ud;Wp;`{!qX?jixLzlEN0eAfm?k-#Im~C0Iu@FAwo;h$;P~fu z77_66f-;-)i#@OO+urkX@4oKl=f%2d z1j(BySYGs=N~14pv_#PwrAc1uI}0=3Z~w77t%QdTMt(vuhF&7+UaXO{J5#1>8YLfe z{iuV>H*v6C)%xx-1~%@+)fUrcdkcrL)P!&RAySc{9?~LX7^APQ=51|r^(i@*Qk$u9 zxoVC2`ps!{8vvcT{c@w&?}11d;NMxwJ^auzZLjdRk}(J|PwIK9jqvt3J-q2P7r!#w zrn~LdL-iEvhg<3_aMx$|7x`_g8B}c98(AB7N?51mwW2V+S!pD~LL=RJEz(4}YV9UZ zpLNA?-Jwp)X13&wg$FYImNL(>>zifOZ?}vse>HNqbpV{(L{yqtHyNExtkx{GSuN6X zTfO0;iY%{H9K@_k&1$#v1fD&?NJ&a3usj*^~FPMrB9o%B(SOwS?2f2hLiw(P@*G=aRI^-7F34l-1JoUHQX2)GKPs zMa2r<7M@^Sa=xJ|h3fg?G_B#$zBna${O@dUR_yyw*tM%S+2#cjfaEj zRSqykzz74rm_ip_nl0)c)!I;L!7bVwsP@y>UA~%^2BTedwr#qoN;l)-Y{-kbKmGa$+^ zg@copiZP0)`iUff5+Yz$kz+DhwH8~Y8VxXtimX{HJy^$5F)S({?59T;7*MF7J)~)* zugR}^!zR$UciJjHI4!IVG}3IMQ2P|7^rH&9Xc6ZZOLt9s)^NJJj08GCy4N3r9hl=3>--Ko?8A1fmJ-oB|G zecG`M-&2GvP`c;f<%bkEEmON2hkgucYnfqY7-lKKAXs%)6|2OUJ4=1>kZEaH_RcM# zbEHeF;HA>pTtp_!`2*|a6PGYEItF-dFHy+os;D=}?1+7HP&Z#Y90@efd}7yQ#y3Cy zrJo0NcpJDQpt?o!#_)_;Shp|3`BQPA|K^VMqjaxdQSG~iKAJ@RJtjyQS^0i{a#=~1 zny*4ej6T^rHm)N3`sME;ZYAK8*^WA)Y-?I7DFC>lMUG?`%5qjlLFl2_PO8pS(P5bV zw6J^M68ts2P2G6DNo9b`uVOnXGi9-k>Y}4r&rp5j($7)tftvyCyupX84WhR%8xES2 zNbtOx%23DgGYxhqoxI_i*DME5U>$OU$q=UVG*FMbxypbCSQr1TwhG`xXnt3A2=d)u zJLCjs5MM=HYZZUwwbrIL`kd1He6Ab!wlbqz=5whQK4Cg_o4(aHJ595i;fd<3Cz&%h z;5>29TMNOIr`sQ?MQPkrjx95MGDE}~wb6h*ZJ#CdR!`~RUYbG3 z+bBNG^y#o7o+HwzX-vgy+3Mh73i6876J0378#oaCi#&{CD={B0Ng!m58`FvZcXQ)b zMCCw_V9sEIHI+NB!IW9f_#IAN_E6QmZhc$l{3_?yyjUQlc&lR zz3O?#3N*}8R~Q+W>R>V8WsSvp`xk|3MS~)3M&@X#tu9-uLeZt4%c{X9F)fzE*7-Vl zZcBtpa~%XmWQhxB)-xDHbtv$K=`sT28Md}v!(?Rf+RTSHvWotv+(ef)||#iG)?7$yr%+vk1|w|sd9BU1$t zJebRa%>}*8Sp*x5U=NWi*$BDxLC2t{f;)tu_`@a-a0G`QMKQ3nV8U=1GkBo1N($TL zYBeR4XN2^g9Nc!;>A%|==Q$*AEz+6y*I+DeOMQqbl!j4wMw?uf`%GkwXn=<2UfETC zFk9*m z9ZV4aF*-iMB_)92B*Bj$0CLpNHBdFse)yPwF-7Az(x9cNZ-g2^MQ*@YhzXX6t0E~@ z)rc^ME*O&M$O_tC8(CXpcG<7_wq((HNe_F)Ubp2g)%jiNF97nddosWz!=L7}lm6~> zUEXec?|MIu?e=Yf)njO!7GV6%cw#;`Uc41Sg5>2q3&IWK^;m;s03h5QFwVt#+(X61 zF`rVRhD-n@l_PG4dloz#U@;u%!8Nv?3^`^S#Oj3-V^teGFe`{6FKQ(s}E*k zpSU&&VqXq77jM^U0YIXhX=HFE*E21jv_Fay3O4q4ZseJrHiNVqONH{OjkNC_wv>%J zaR?fcMTJ`ibHo?bU2>kaSw))Kpj;r#RHnyNZBk%=Z&DDoWH4<^42GMP|E?$iUf!sK zyW5#0?Ox^|S@g&;m4;IT0&yxcELYE}{gp)Rs6HE5Zblc71{lY--61Teo6eXckd`(3 zgMK)iV!;L?gC{1PO>on!Cet7nwH$_a8EnOM@d&RLL$*1CEW(kJ?$0SYZo`7C6sDGA zB{=@Mv?W@O5k0~zr(>Y?ji5m0)KyK-XgLwq9irrt9bE}sYq=QI1jgRR@SEvipAU3w znNlKiwP*x>1R$?<)Z$t?*vzT46kbXz!*=C>YZ@7V2D@ooT3vo&qc?lfmb+XYj4!Ur zk(7zNTeA^lHXUSc${Xg)oYUvZyh8M=C|3##o*Cz!*E5|!a1?fpw%!NE6p^hKc{g?O zDcx#Giyz&tU)8_ z>hu=vV1V_cNh1#!wLM|joj9FZ!?K$dbAX&!oNFITYsM%OU2dU@pk9_a9*KrO;^Sw# z)vX#<>Jl-5wmX%Gl_7vTI3VL717lsCNTkk|n>JuMz{p)Tmo!kllx)*^ zd9uGG>0%`jVKyYV$(6|Rf=Xw*YAq-kiws9C3E)D*KHr0t@#w2zf~(TuG}aFIQ$b|S zC3$~!8u$kTReaimHz}t3%5?6QYd{E5G%v z3ZTTFBr|5LDCJf`F%e>75{ftd49CKXnZESW9uSlD^NKpNo?K?`J^47wHFUr;&|%d1 z2idG3v)3x{$!}HY;qSW=kVW-e>=UbrxEIq|*NoVYcs0c}Jgc5D~fxd%mIA_m%oV^p0wu_06U|cF5uUJ zy*Wy$A!pE?pjE~>t@lMrnzV>wrXL(%PUO{;(Ltr^a+x84NYi1YX&104az*|V%@2k_ z(%*qc8@g)yyty1$)kyWFI)j7S|bmpzsOUQN1Ya>4-q8v2D;~6RXdTKvH{!c zc_J(UmGmezNEV6I#h02?X9=6rO==*01KXzEGc$Diz=q0G_RX>XYeHa$I z*F@BgPg5E^G8zS3Rh$-9r6mzBj))}{Qj?G;D7J$B8wRLs z!oiWQ>C&Fb(jK{-nDfC?s?%AjlYrfOB0EExZ{aG+F?OX8_6C@1BSP+Br7I+Mw@8*V zH1h_UCAjUU7{6SbR>h%?@ygf}Vyhs5ik{X&bd)xcRyB|VsMZA4z4~%7ol;=?eQNG{ zeENrOC>}{_L-W=NJS~cM-*8S8N4Iw!Xyai^4lBC^%aKI`oPY)`uNGEV1FA*%g>CFF z`m2d(?*<0aOL0Up(7Ob6I_5qA@c&T}Fg1w(n&%NTRH6Ru(nt7Gg;D&+r7xdkuTRaa zGCQL{H6x`aDJ3^GJw-b)J$I=5GBc;*AS0*D$g0A~*u>1*%v`VP;0CY6$jr!kOr4ae zkBfT@@;`P_6#h{udf7Xs$$##O4V*NmPY6)pu^%Er+PSS$72-9rfJn7VsidvxR5$0u zBLT%Qs1oRtPuhCvaXrK_2k0$HE}tYqkK*2=qqf9aHY7#`$P~QyD@ga;ef6g#8v$P3 zJeEnZxgg{wA%#qu7xcg)V1fi92Fi=#PoUBky+%b>mdMvs7v_egbBJ2!qGh_0?KDAW zWA-9({ZwolOlZ;#Kf`1wuYF(v!`69ul2&vk&N1Z*0g06962DYj{ zuU$jiTi`aYu^cugWGV`uP*>B0|9?RL^_ode1~g#*0!;-5VIcoTNwmgi|Dmu>Nn<@n*o$T%w~!wyibWVLFGaDZ1isV<^4u`7k#gI)mGR@tX%8LxqP{(K-d|)c}Q>kF*HPl%tP!bza0_laa5O zMK?9Az-q+Y5b`Di6r{fDy*6H*HCBHb_r0l)*qM(S?~dYqX`r3=a?6$U^YBOYrDh6> zLTPFY8-P^bxyH$FLz9m3EWJe-s~$zxGZi-~%Ks>&!g2^seAX{+TTU9IWBOJaFtuc=ff<*$wc2#B=A3HmA%dA71` z$jzCBd(wKc8hS27E1vBkHM^M_t-J0(uWZsFHel5yI;2qxi@%P@X^}pYM5{2PqJ}no zmgOKPa5%ZgB6$usmh9!*Fie6;1S+I89Y%P?KX9k?%7k&%?M+@k<;fF_YWyns_d&gH zmWYmRU^D4Wq8j|X?W4l)<=V6=j&Ne|33Z$mjZ0NL#CgIlZ?8hykbJAFadlPNn~mr1 z8^8=4B)Slw*R1PAwB#+=7P>GfiqHhR>LXW8p&aJM`o?NTE#8WSQ>kfEOeI;prLv5! zOq%Yvu-pczyB`66v%$`w7hguaWkBI^`DBvsZ^IPJ0@9&a7&j> zTIn=f(^mWNgn=pedOzl7J}(X)3)blf9iaM8!PRHyQ?l&qpH$++@;2#5EUqoLc6k5a z;tiC1xg3*h&bYPfSqp5pzL3wC!2-DX-miK;0(%#+9Y%E-&mKXxL1g_r&dX-knN1eC zt;4qRtsR8OQkNcB_6hTHiR3XCC;}MVu|%scfg-;p2oNdPn%<2D9iv?bYGNVp2>|H& zOZTomA|o8GKCl|D-7)qwlDl-K7}n;&XKx6-RR`Xmb~YuyM_ye&fdo_?<_W!v&IhdM zw?77u&FMx@F;ds-xMz)|$Kvjc{p4FSz_Ncjnq%|!%J9HMxM%mE@d^9GTtDG(sr_mX zgE;FBG2h6>oR@k|LnyJ2y&%eJX#tu1Ctn1mPxA(@l)oFcT^71!i${=^(!tUD79HVn zx&2~bx&4A*uSHuMiixt3j}@Bd@MqPhesmj1wQt0i%xM?=CV|I^Swsj*+;{dQ#q6{p zn1}L0(!y8UI^SUv->sI(K4>#FY?dzLC?G2WE!UWy3=Q;meESzyo0TvZu(> zhc$Lxu14cH)w%56_;yCtZ>Fg=gnse{WrPCp4uT*LNCU$U3yKajaBGq0*l=cy7>*i= zaLRC=#Kli`Bm|g|zk_l{2e)q$QQrt-?dNKAHVBOJ-8vfoAhFgW9`+>fLQ;M`e(Acnzg*wm;6r@br0WkZ{eOLUF(oBt zYUPR&z8J>Oy&e+C9_VRu`eV+=VLBo)5XVTA^GShW0Q%wz{jtoLf&omtlK>#{2%qd! zby5xo2YE&5r*k9;vm9|bY5?z~%c!Z5)LedoC}Nau zJ`cEa`(DxqhDO2#W6t*KpDy3$oo$vR(>a39NQtjG4XMYV$?Wze56%6sR-!@5No&9iXWL6ciVrjDEQ zt=;+`c8C+yAOP~ZwS=ho_V9k+5&I?$G4kv^jBY;f+%JZSUrV_|rNO*@ogNv(BT!0y z7<2Ek$7Ifes?B#RJHE9Q?nS*Kh$9kjto3_E9@BM&^w~%wicrqCc2s*L-t}v$f;|cO zv+m&7MNmtxn)k44yMt5FXK~rtY}lckof-CNV80JKe~F)p^=LoMhc7XhhmeplVG94* zp`$`>O|!fn@!OJEqU%x;$3*~Y7JigQ&A$=Pw>#In>-=R~{R8s9MZ9SuV*bCPoD)?E zg8VPBrG);iriuatR6+f(a|*!zr2oTUsk+?p(>v{CZby$q0t}%=5@kZ>k3wV<8XlPl z1Tg>=o_0izojx6$0gV(wEnTCXR*4RNsaMikO9{;s+2UHa(zR>wRr~ zc}e~SINiyZmZc|u8H@9t&3??e^|}16d}9vl0}jAjeIg zD(S}06?G``ms#+Nm*KWk_8Yrq_8+nm)Ge7HfO`af@~iQqh8QKvYuq0JDI_Eqy=Rk? zs(|vsD?dB|%>m}$Tym(>O;0m$(#}*z@b;7~r;b$UX{e7>sNl??cd6f}F}RjHx!!rx z=He9sM$IppgHJ7WYnGUE>+V5fFfW?3tz9aQ#e|zR56QT5NYynfmpqx9g3~O0QsptB zhP3%f`=>^zU74NT{M{z$X^xy@XHOqI7j-J`-`|^a830gs)G?POn?yRb2zNLM-nRY> z$-6N)bxY^WhCaxclJ-6Ag}PqHIQCF?BZV4C@-;pYPwWsLNt)(OvuO_)ISj@u{W@YO zZ$(C03H2zl#v1PALk$+j%mlHm%Ol*}Gwm7CBWwsP zauqD7D}YIh!ASDKi930kwD5|4y_^m^+@-gu!p)+F-%8$2G1v;4_oKxb&8$1I_zavA zy1|ysQx1?SO1_*4{VOjvw%u}aLTMW-#prDks5lZCqvZ+CgZHA14c0VA7mP)82K8H3 zF(Wnq%umLapnqL&1Y zt$kxN71^q>2Z>b~-M3b@wy&c!RA!RyQ%kg|?U$Rvc3Dt)#Ilnntkr(p*;S1&VWR4T zzytnxr1mkYtQonE)|jchgLDactj+K6;8iJ$;2s#l1wB(OktH8kov-f)cd!`^9DI-L zTX1$HPpBw&=1%BfS~rMlg)h%9H!Mfip$glyP_NjCuVmfVf4V{ROuR4-r++|quIDCP z%Pcx^kxcl3cLd4y%4-d>_L&?S(4?N&l>pw_Ol+VK-e*7s8X916^N%98XVj^Q3|qj- zuvKY@BP=+(ui?n*4;e~X!kR~)gw{dn{b)7q|kTvW@UnPtT4KehnFrF3$uR~CTGV`fyu17$%HNiyK z4>uxt$#z4pgkEXnb`XV5OH zF~PGFCsnPXwiqnGDtKHlTLk}tbKJ~P-U^GAv?(~$p%Hes5wu=r!JeZDtLQ@|zO0?SS*s(3%4VZ>77TVE?JP}Z{(+MvN z_WH+!-r%PLBgyIm=wpn*(+^t5L-z4uA6b>^j!f0xXEpft-`niII zJ14SpeanUnW$AP#cZRjd!~%&@3^=~c`=x&pyzwD=zZy@qxmc4H4dZ<_j!QZ@WXPPe zyd8=bqUX2dSxiH%2a6Twz&)TLNOKwm0%BXr9oxnKhVcy6rAkP@m?xdQ*rV=7+Rcs3 zP-W_>zHOeCca-R5RFpMC6ZX0MA7<`Te^;!{yqBklU=a$t2^OpUL*ekihqdds~ z$=sxVbQ?l{RwEqA`=}|c!fPCLuBA9-Id9=jI;ifz7f0Xrj;(ulZw~O#;@`ei&-~`> zgD;%lxVU%u4pBNu%rQgTZdx~Y2v%Ob<#C=ka}2RNzKZRGx@&Vs_X!?kf4u2$N;ZX3 zf-sV(WeTx7tB+R51IOR*4pO(=EjvYvj|MpAF;2-cPa!5{iDy-_s0|-8b_}{jDHwy7 zUvnrHbIK@K72-F!+Xj4+1>GWxY)!Rc`w;Hh-+}s+4InOVLkJA(ue=!s5hB}lAmAli zKoFkP6&n%bc9OaDrX26NI!*-!Wt_k@x#6};MYs~C%xS=X;|QcKE)6`MxmA(jr#*&E z@VvTrxIDAXgq-v3jL>Zmb;eIBX zh{)w&$BZV9m;q#D9BGYfB3c&yNH)nONoL-g+}AoZ_IQ{bPisMJ%eGm3!Uy$DFj#*^ znhg7u#ta>4;zfyfMr9c<6l2E<&(FHCz_=dlpB$XHc~oN)rwaN^>Q$~YJFiecRA2kV z=(D}CA)6RYl$v_8yXq<70`KwtB@AVSVEEY5ZNa}k;IT}V{hzZ zi&Uf%k`fbH`yMl1{pS7a_gvRpGuP*Q?$3Qc_jBf)xz7E}ZE#LFe4O(eaHC)QWR9Qy zTkBP!8@h(ms{3K)=2KomcIzp7Wv9?CPTc%O4-uK|sma+T8f;nlYFM5J?Jp<39<2!G zZ|fzEwBdf#`VIL+gg?^m;SMOBY9t-`rBFH-5srp7&R=@iG?rxZz!sIjl4)p?7eis<(H&lAiwoiW+A(bkoWU|uJ;qHDOS<( z)-}Zi$Rp-99r$-W$~gf)f~K#WvJ+KxCOnp{3fX5pen`42zsR(GU}cHRx*uI-W0*)POV=s;GVdT=2$#w61H;GckE+Xt?n8(r$9U;i}JZkB`oy715q zHj1g=jQfZl*(&>J>|MNFBGr;!4tMqtHU0 z@W6%PelD53M1S7*G1*SQV6eYd;)P!!Egt*N?wM~bcVG$28Xq!RMR$ak_FIk{NyKq+ zEXdF+_xlF%h1m*copQw@x17BZd$F_c4LL4E1(P|01^lW=H=_@qwZh!fUnUh54tQ;z zsv8z433Ip7xs`@!+HfMDoO|}+j~-d-=IzJRkX0!Wuewc3(vWFhMrZaxQxP78Ujx$h zN(Bu$(dnIst5e%ml2`iG?5@^{T^5OTRVQ9HlxrnlOE>#e%(i+9J2Mo%af4{B_B={b zI6n-N{_cQLp_0&-KzX}&dWFLIdve)UwKXcE3Wk5{Z6VV4hM`2$aLkt?f*6c$&5%6^ zCN}iZ4|Izo@SK>Nau%LOWixh14xfqn#{%z=qsLMumZN2&I>nqK{7~F1HGGY8YQ=&< z=*+74{g9$|IghA~V5}071FC3sV>L@S#h;wrQmb!~oUZrsS$WQrMz?^;Ohh`e)h}>{ z&Ao7#UN;n>z9h;M36s7i#`0dYWeFZM-1IOvtz=E-9OUVO5jou^&$VJm`2MZ*sk+Eb z9nGMRQ!RM5^3NBe=ek7-1oS!%o~ZGCvk}=M(pUNo$H2p73O?&FMHj&)VwDh+s8|&X z8T(VygS_X^sfl;7Z{3mCEEMexW&9;@;WC$>)A|R zn=yNeN*by96qd>8K6A4rnKaOHNK;DiPRHXi6=(;ntjA^aqRN=Z4JVn6GAO2j9#d-# z_2pcOh_m)Tv8Y}79W{pmr<+&$=GwgIlw24JzWz3w3$bz2O z@?5|;j9Dxb1v~Ft9(dsubHgfJgp@q-z3?Jz%N45WiG>z-WrT!XtM?Dky9jq&cVjT_ zH=SS4pmGJ14ri%$G8P#Qf8&&{AdkAbK)#FC4Q-Be#=~p1Z!0%1pXs!&<4Cls=A|1q zlh0r2$3`Gd3FyMpJ-uHNTV zJvHmk>=4(;m9R%VRL@}2+(4CYPaUI^lel-D0d~;dz@npkU3B>B?Qw!=BPLRQ4KlfC zdz<9QsU$LJTQc}Ir1i2Nw7$i4;QH?)YqBH#E7h^%Q}$%Ugs#>H>lyTh`exb$ES0-X zSi5cEeh7~}!}=%BZXT29*m#xo}y>Bs1u0l>VU>L`rOyWux~?J1Z~!1 zGaHy1wqB*VdZR8!3GC$9nTx@Aj#HMI=;6VW+8f)CTQ96!tAe%Q=s6S*nq&x-pI zq8Zoe=p_7joT=<-W1H_9#{!Y=`lKIPat68Pm{*D0(hK>vZ!MOte7@|STX0=n!$<6I zbJNNf#N)F%V`ol(&a(YvLHz3Hk!Yq>slrorY|jTz4gL9gZv6-e!v+~;0_yq}^T}2P zVH7v&GpW_reK`<1I8)_xQW;=CH;%i!u9wRe; z8b`3!sbvaiu+ypKV`^sR8F9#r92_KJG}z}~3A+&lwo)>QNM=!st+&U7i%HS0t>@+gUDO?0c*@QGW^G)Yp&SuZ|c>n z6|}DM!Kdcg$1Stq14-W*;`?&z%~!87%`biRS03|}*A$q?;B!s}%6y3-VfM~nb9=V( zrJvnRi(^f&f1JMNmr(xo%_c0wjD5Go*7oD6isjseor==eyosGpJq4BY)S6LbF>I%f zbg%Ts&Qa`hyPbzz6Xn`FJc$>5JJ@oy#SYJ;Hi?dX+ehyUju?Hggm(h?)*xy1|0xWX zDX9FP!k|=V-zgJW>8h#2hkKA6-6oZkA|VvUO$TnF-f0yEs1OusdxZf31Z8T+uV(}} ze>&*@vahS0nbCjjCJAt81F%7WQ@QX)ICK_lC&C99H?mS8+eSD{2nyhuc>psgCy?35 zM#W1&90J?H_W&rE6tK5x=NO_14hx{C95Zbar1E`0>^uVn%W0An-QI#D^wIup8v_Kg z22Ml~jPT!q4`pJe5RWs90`O)w3Yn%k*}qKi9Um&ZmqMoYD%+3z?;L4cN&U6NhZ2F@ zW-W?1rMn8)`3wR^Bl4F5im&rf#Myb-0MQm|Bs9HOXvlH=6ml;Aet@}~N~ZaTISqMQ zghK8XVL$TUkZJbL(->*UQH%~M!U5q{st20g^fY86B?{T0Rg5yp+wlD2axm4p{16EE zICgj7Lx(ge#GEEZpr%!rLjJow3IY+|rEaIY*N{SHYui~^WE&hNY(~Ly`Pl*Ywgc1! zPXzHp<`mov$_#Y2aZ!YK>*S!Q1dTBE9I(-LRCN10^SA5`fq>EO4tyx5Enw0vX}?X{ zMz_~&dw~Dp-x-{cO&v}<>gn$4>*V5fQO?=Ro#xEnHclXt?`we87T}5>{nr+J$A@a! z0i<>+a0Yxy(U3YFfDc{bfSoflVDpNNLN?dkBU}V3u7I1$G-$|Gjuf(i zixAM+K_%Cfm?$KI+NF%?79Ugis=4J-;zLbCb$~3WY(PBNj7xz?cfz-Ob)1dIL5AFfp#%q0 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..f6d5974e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml index b7700880..b3a9a5d1 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ ${basedir}/src/main/javadoc/overview.html ${basedir}/src/main/javadoc/css/styles.css - com.pusher.client.channel.impl:com.pusher.client.connection.impl:com.pusher.client.connection.websocket:org.java_websocket:com.pusher.client.example + com.pusher.client.channel.impl:com.pusher.client.connection.impl:com.pusher.client.connection.websocket:com.pusher.java_websocket:com.pusher.client.example ${project.groupId} ${project.artifactId} diff --git a/src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java b/src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java index cce5857a..07e5f256 100644 --- a/src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java +++ b/src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java @@ -10,8 +10,8 @@ import javax.net.ssl.SSLException; import javax.net.ssl.SSLSocketFactory; -import org.java_websocket.client.WebSocketClient; -import org.java_websocket.handshake.ServerHandshake; +import com.pusher.java_websocket.client.WebSocketClient; +import com.pusher.java_websocket.handshake.ServerHandshake; /** * A thin wrapper around the WebSocketClient class from the Java-WebSocket diff --git a/src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java b/src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java index 63e9f612..8bddcef6 100644 --- a/src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java +++ b/src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java @@ -13,7 +13,7 @@ import javax.net.ssl.SSLException; -import org.java_websocket.handshake.ServerHandshake; +import com.pusher.java_websocket.handshake.ServerHandshake; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/pusher/client/connection/websocket/WebSocketListener.java b/src/main/java/com/pusher/client/connection/websocket/WebSocketListener.java index ba12613e..4ac4a665 100644 --- a/src/main/java/com/pusher/client/connection/websocket/WebSocketListener.java +++ b/src/main/java/com/pusher/client/connection/websocket/WebSocketListener.java @@ -1,6 +1,6 @@ package com.pusher.client.connection.websocket; -import org.java_websocket.handshake.ServerHandshake; +import com.pusher.java_websocket.handshake.ServerHandshake; public interface WebSocketListener { diff --git a/src/main/java/com/pusher/client/example/SimpleWebSocket.java b/src/main/java/com/pusher/client/example/SimpleWebSocket.java index 16fe2ebc..1662c6e6 100644 --- a/src/main/java/com/pusher/client/example/SimpleWebSocket.java +++ b/src/main/java/com/pusher/client/example/SimpleWebSocket.java @@ -3,8 +3,8 @@ import java.net.URI; import java.net.URISyntaxException; -import org.java_websocket.client.WebSocketClient; -import org.java_websocket.handshake.ServerHandshake; +import com.pusher.java_websocket.client.WebSocketClient; +import com.pusher.java_websocket.handshake.ServerHandshake; public class SimpleWebSocket extends WebSocketClient { public static void main(final String[] args) throws URISyntaxException { diff --git a/src/main/java/com/pusher/client/util/Factory.java b/src/main/java/com/pusher/client/util/Factory.java index 621cca37..ed93424b 100644 --- a/src/main/java/com/pusher/client/util/Factory.java +++ b/src/main/java/com/pusher/client/util/Factory.java @@ -10,8 +10,6 @@ import javax.net.ssl.SSLException; -import org.java_websocket.client.WebSocketClient; - import com.pusher.client.Authorizer; import com.pusher.client.PusherOptions; import com.pusher.client.channel.impl.ChannelImpl; diff --git a/src/test/java/com/pusher/client/EndToEndTest.java b/src/test/java/com/pusher/client/EndToEndTest.java index 2f280a76..cb1be7f1 100644 --- a/src/test/java/com/pusher/client/EndToEndTest.java +++ b/src/test/java/com/pusher/client/EndToEndTest.java @@ -6,7 +6,7 @@ import java.net.Proxy; import java.net.URI; -import org.java_websocket.handshake.ServerHandshake; +import com.pusher.java_websocket.handshake.ServerHandshake; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/pusher/client/connection/websocket/WebSocketClientWrapperTest.java b/src/test/java/com/pusher/client/connection/websocket/WebSocketClientWrapperTest.java index 3e1af525..abae90e6 100644 --- a/src/test/java/com/pusher/client/connection/websocket/WebSocketClientWrapperTest.java +++ b/src/test/java/com/pusher/client/connection/websocket/WebSocketClientWrapperTest.java @@ -8,7 +8,7 @@ import javax.net.ssl.SSLException; -import org.java_websocket.handshake.ServerHandshake; +import com.pusher.java_websocket.handshake.ServerHandshake; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; From 62a53d1a4b62647a4f4c9d36945448f01d12cb29 Mon Sep 17 00:00:00 2001 From: Zan Markan Date: Wed, 16 Nov 2016 15:12:43 +0000 Subject: [PATCH 2/3] Removed the snapshots repository and updated changelog --- CHANGELOG.md | 3 +++ build.gradle | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 084b9665..44b1376a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # pusher-websocket-java changelog +## Version 1.4.0 +* Update the dependency to use pusher/java-websocket fork and remove dependency on clojars.org repository. + ## Version 1.3.0 * Add retry logic when the connection is lost * Accept 201 status code from auth endpoints diff --git a/build.gradle b/build.gradle index 2f88fb75..998a7417 100644 --- a/build.gradle +++ b/build.gradle @@ -39,13 +39,12 @@ ext.sharedManifest = manifest { repositories { mavenCentral() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { compile "com.google.code.gson:gson:2.2.2" compile "org.slf4j:slf4j-api:1.7.5" - compile "com.pusher:java-websocket:1.4.0-SNAPSHOT" + compile "com.pusher:java-websocket:1.4.1" testCompile "org.mockito:mockito-all:1.8.5" testCompile "org.powermock:powermock-module-junit4:1.4.11" testCompile "org.powermock:powermock-api-mockito:1.4.11" From ac7c24788e118c722fa5a1bee608e4bf5b68f906 Mon Sep 17 00:00:00 2001 From: Zan Markan Date: Wed, 16 Nov 2016 15:20:04 +0000 Subject: [PATCH 3/3] Remove Pomfile and update version in gradle --- build.gradle | 2 +- pom.xml | 335 --------------------------------------------------- 2 files changed, 1 insertion(+), 336 deletions(-) delete mode 100644 pom.xml diff --git a/build.gradle b/build.gradle index 998a7417..a78c39de 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'org.ajoberstar.github-pages' apply plugin: 'signing' group = "com.pusher" -version = "1.3.0" +version = "1.4.0" sourceCompatibility = "1.6" targetCompatibility = "1.6" diff --git a/pom.xml b/pom.xml deleted file mode 100644 index b3a9a5d1..00000000 --- a/pom.xml +++ /dev/null @@ -1,335 +0,0 @@ - - - - org.sonatype.oss - oss-parent - 7 - - - 4.0.0 - com.pusher - pusher-java-client - Pusher Java Client Library - 1.3.0 - http://github.com/pusher/pusher-java-client - - - This is a Java client library for Pusher, targeted at core - Java and Android. - - - - UTF-8 - - github - - - - scm:git:git@github.com:pusher/pusher-java-client - scm:git:git@github.com:pusher/pusher-java-client - scm:git:git@github.com:pusher/pusher-java-client - - - - - MIT - https://raw.github.com/pusher/pusher-java-client/master/LICENCE.txt - https://raw.github.com/pusher/pusher-java-client/mvn-repo/ - - - - - Pusher - http://pusher.com - - - - Github - https://github.com/pusher/pusher-java-client/issues - - - - - mike - Mike Pye - mike@pusher.com - Pusher - http://pusher.com - - maintainer - developer - - Europe/London - - - - - - clojars.org - http://clojars.org/repo - - - - jar - - - - signed-jar - - - gpg.passphrase - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - - - - - ${project.artifactId}-${project.version} - target/classes - target/test-classes - target - - - src/main/resources - true - - - - - src/test/resources - - - - - - maven-javadoc-plugin - 2.9 - - - attach-javadocs - package - - jar - - - ${basedir}/src/main/javadoc/overview.html - ${basedir}/src/main/javadoc/css/styles.css - com.pusher.client.channel.impl:com.pusher.client.connection.impl:com.pusher.client.connection.websocket:com.pusher.java_websocket:com.pusher.client.example - - - ${project.groupId} ${project.artifactId} - ${project.groupId}.${project.artifactId} - - - true - - http://download.oracle.com/javase/6/docs/api - - -Xdoclint:none - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - - com.github.github - site-maven-plugin - 0.9 - - github - pusher-java-client - pusher - true - - - - - javadoc - - JavaDoc gh-pages for ${project.version} - ${project.build.directory}/apidocs - refs/heads/gh-pages - - **/* - - - - site - - deploy - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.1 - - - add-source - generate-sources - - add-source - - - - Java-WebSocket/src/main/java - - - - - - - maven-jar-plugin - 2.4 - - ${env.snapshotname} - - - true - com.pusher.client.example - com.pusher.client.example.ExampleApp - true - true - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.1 - - - jar-with-dependencies - - - - com.pusher.client.example - com.pusher.client.example.ExampleApp - - - - - - package - - single - - - - - - - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - - - - - - - - com.google.code.gson - gson - 2.3.1 - - - org.slf4j - slf4j-api - 1.7.12 - - - org.java-websocket - java-websocket - 1.3.1 - - - - org.mockito - mockito-all - 1.8.5 - test - - - org.powermock - powermock-module-junit4 - 1.4.11 - test - - - org.powermock - powermock-api-mockito - 1.4.11 - test - - - - - target/site - - - org.apache.maven.plugins - maven-changes-plugin - 2.0-beta-3 - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - false - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.4 - - - -