From 60ac3176074d30e3fe7b4cab627704c027197edf Mon Sep 17 00:00:00 2001 From: Sergei Lebedev Date: Wed, 3 Feb 2016 18:31:38 +0300 Subject: [PATCH] This time really use Kotlin RC silly me! --- CHANGES | 4 +++- README.md | 2 +- build.gradle | 18 ++++-------------- gradle/wrapper/gradle-wrapper.jar | Bin 52271 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 10 +++------- .../org/jetbrains/bio/viktor/StridedMagic.kt | 2 +- .../org/jetbrains/bio/viktor/StridedVector.kt | 2 +- 8 files changed, 15 insertions(+), 27 deletions(-) diff --git a/CHANGES b/CHANGES index f6af4e1..0d194d9 100644 --- a/CHANGES +++ b/CHANGES @@ -6,13 +6,15 @@ Here you can see the full list of changes between each viktor release. Version 0.1.4 ------------- +Technical release, released on February 3rd 2016 + +- Migrated to Kotlin 1.0.0-rc. Version 0.1.3 ------------- Technical release, released on February 1st 2016 -- Migrated to Kotlin 1.0.0-rc. - Renamed 'StridedVector#sorted' to '#argSort' to avoid confusion with the '#sorted' method on primitve arrays. diff --git a/README.md b/README.md index 535ebf7..6579781 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ repositories { } dependencies { - compile 'org.jetbrains.bio:viktor:0.1.3' + compile 'org.jetbrains.bio:viktor:0.1.4' compile files("$rootDir/lib/yeppp-bundle-1.0.jar") compile files("$rootDir/lib/simd.jar", diff --git a/build.gradle b/build.gradle index 8424704..31ed442 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,16 @@ buildscript { - ext.kotlin_version = '1.0.0-beta-+' + ext.kotlin_version = '1.0.0-rc-+' repositories { jcenter() maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' + url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.4" } } @@ -19,7 +18,6 @@ plugins { id 'com.jfrog.bintray' version '1.2' } -apply plugin: 'org.jetbrains.dokka' apply plugin: 'kotlin' apply plugin: 'maven-publish' @@ -27,7 +25,7 @@ repositories { jcenter() maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' + url 'https://dl.bintray.com/kotlin/kotlin-eap' } } @@ -43,14 +41,6 @@ dependencies { testCompile 'junit:junit:4.+' } -dokka { - linkMapping { - dir = "src/main/kotlin" - url = "https://github.com/JetBrains-Research/viktor/blob/master/src/main/kotlin" - suffix = "#L" - } -} - task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allSource @@ -89,5 +79,5 @@ bintray { } task wrapper(type: Wrapper) { - gradleVersion = '2.5' + gradleVersion = '2.10' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d8d2bf522ff5de94bf434a7cc43a9a74b5..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 12498 zcmZvC1yq|s({6An?(Qzdid!kJ#oe9a?u6pSAvhFwEAH;@?o!+-TBMiKe*brS|C@7i zcFyxYGdsIGnM^kGEeRqZ2Lef68Uhj?0Dy%B&{f5Y#~@K6{vPM!lN1F30Dwx&dnHU< z@aszlFu;GASihNtB#^J;2=$-wmg#i_(SdEe3e`y94&Z;F0La}xkPTGMAE+7=77ZHp zxBdvCu2>8>0B{ct05F1LAhAGlNccdI^+$9el>T4KdvpE*e!kh+WGAF)nHy|y$SN!< z2$&LH!sT`eKQf+9v>zVE$Mpca=QP36 zNrU3oRtOd`HRXHnkf(e{`hjsav^3;Y{frZ=0hjzSp2Y@BDniHiK6_&#{!=xLz4P zp6>2t<=!XvT}@{%XZ6&B%8V4a;TjsDy{Es5ZCM)V(GLrC)>eWt%)$B3Sn-^w2WMg)N&imq{8 zXXwS3^XP4f9Zf8~VFr5+1}KJHe8K3wJIP{#)x&6`@Z!FL&`--aX8!6zGd>V?B-nAK zcnoRZ8pkEX8m?rJ_KY>e1R@lRwSs~Rb%>+YkIQBWmsbsgRxl0c>&Dc^OvL%_&R7H# z-#uEah(k#W1DS2vYol)gDGwtrY`lL$COgJyCw(Ou9kuJSo1vsSmw2;2WJkz}L1K?< ztO&;{w2k>9<%;38BE$Y-e%#WMiq1t~&4FwzgO(g3am-CVgHS{v0ZB!dB2;BUHs(MN z4v|Dj{>Vj^Q1F$Z6;fm!aHNz_L5z(RN|3Ccg2|0w&@i#aI}B~xH5v5z`}ECQ&P;s^c?%%X3w056l3=-W9Y@HT)vMUQn}npoA+QT z-P;h_LndIw+Ya}o(fNug#rE2x?C?zIKRyIv4~F-GrHo7G0*f*d2OWWpA)X20UkNh} z%ddaHyO%R;IJ&9$j_>>ccPmkHbM{T}$L>4Kvxv@DpeaR#-+OQ`yLw0K^|>qK(y=;Y zUQ%4zcWnE5$_n;8uti~W4p6pp;j>0DK02ig<@Ux_<&G?H*?6iBP_}mh_GvQ=a}709 zb#u8Z@$O#nzCk91F7O%%sI_nI$^uyLxd;Y7S=}`Xe?MW^c*`MLGW^t{l#Yr@Rcy!b zp0I)<<&Nugmp)gLCJkXi&L*xe_6u#GEA0w;rcE;bp036Ob*L`xM#>crkboG=jp!u*;G#UGTTNc;nn#kCv>QNV`B9sJJ2 zpTAr++n`|1w+S8%{89GKD8DxJAa*Kh@@Si#yK%upE2-uBqN4L%nk!38Dz;D8?KL%{5YH6_`&O(rKx|pTqK3%!zguF))g|uKs*T4;y$y}E95XgrMUgDLkk zNQ@?)xvVY48R$!8x2W%eCn>G!0t+2l#g}5ZO8dqMkv~)+NX6@ZX#*XLfyIY9E;q*Owp^l z#;K-;dKTKgScH(NBgkVw>Hu|l8fwsu4wco)EsD*fIU?F5-~<)e^BF^VdSx@Zq*(1E z#V)C7T~tjfr(q9sv{^Q-IXkaWQ@j*Tjt+BdewbuFHDXC6c4k#iD1Nxej0_djKuBrK zOdag7F%XM<-?hRZfD_MSK{7^?p5UW~2FX(Cd=I+9YSl5^8muDTzEeFp{~nIBFxlHd z7w4gHuDFV<$+$^$;~t!#AJ>Z;S}{OhG+0nZczBuUeN4^y9yj`PZkmh z#}%ogek>jKn3b_%H(JQgtSzXq!p8`w)^gI&Kml@)1?5f$gyk_SNai1(KwNGO6Ce5+ z!a+==SFN(2cYmM}#B81l*mBf1qMb**7aNhfGVwN8#+9~=2H}~A#9|P{jDn$Y;gTIW z{tT=goxkB|};Py5nBFFmj&s^wEeg-fyE>2F6_yN8?~hUd6& zKZFHL3{|2Jm3?Nd!OBRRlXR30nnTM{VaL*34#HxJ@5N5<+N#{0ZCUFT)=q#+#58ho zwW%?dU?i@tt7@2)+e6x#y=wWCoImyB$`2^jp5>~-BlAS}l;)E)MZ%vm<$Q%3U!G;D z;t@ckav;`56yC3FH`S29 zyENRXT zym_Vy7)QpAO2m>`dVt;!JNv5lsb0YM2shC~>swDUymB-mDXwS?TbfrO$;`{{N9*`g z(xiP7p!klsKIUl^JtLcOfezzZR^#AAR=3dRw6q~*B}d1Mvz+qTbkmhi(3}kp%ji_j zYL%HKfBvkB4qCPJm56e6lhd1stWj6Sjy=oOFI-rf-gpeF)GY)RDtVo%Ux|RhODQvD zDair$XxZch=n0f5>AvO%0np(K$5X?#ks^G>2PyFql)bugh$@Vs7LC36K~=@7^pXiZ ztjP+XQ2C&=)6!nygUj+c7mNXOXO{?$Pw#icp(3J+yh4c8?%?7xF#3sieU9gZldIpx zOgvC{7xTRrRJw;1%)6Yv?_ik>L!LPFzKxZ=Ci~C%&CppMi+b(jru|!~o17*+K4zsCcg?(k)vRwC}0AiLLxB zAQ<;$NgMh~q>H(@v40BZ=#gRXtZQ(h@VkRm~MSOy=cTT%1~k<9V1 zZOM^;`O}RKtxlNV9Sy2d%QghZL(wjOuu=w$R(Sf6Nn{6o>z%y0d<9P1io| zN>-olruF_l^&lo%e6-&D7-lEj%=&ic4q>M%t|(7d_A(6^ss>3zU_V442UN6J9N_gk zAg9_Ps4hroA}Xx~S@by_sGo`mOh$azgsnX37FKP|GJNOjzBn8RT+L{>#I>naQXOlh z_;GNsE%Wtgu}6&Krb`|kSI~5JMwsi%guy()*e*Pjnb(L8^w@~}`WzFM-}4)tv0W4D zMug<8*tY1%bJ#aj_21rF`iT{tR@g}1`y;{Rx7lez+FB%Q$I1|;Cm(xu+pBt=On6Hw zSb*r)ytpczG<94EfUr!J)db9DadT1W8Lfsze3j)k(@&~=NFxxU?3R<89Wz+^^4xS| z%okgQ@TFig)tHzL;%?HPk?a;;A0ii*XH3riAc(tZhn`GL8YuS7!gJw*tL=D3jYN$N z-27oT$7<&5Fc;fmH0=V3A5jq7IM;nVwz`a;+_eV-kuWW`eO!v_p#z-$o^+;wffnn0 zw6H5NNZfg-FEiBK;Y+P2> zm2Aw_PfCK+6W~#1ywQi~g>O|EkV z|A4B-^W2$`#_b|aP2fG$jz5MuJppI3E)mH!a|F{jE*UBJ9fQkwHNt$jU@N2yVNbmK ziLqX(hXg*rYS4mEz+?6cJ`iU};o791xn^cK-v-U6AL{~oPZN5Y?yRc9a zosKG^g0kAdri#+{pm$(QAj?)ETS3gZ-C-lCGUTUi|2CnNB~_v;s2}w7#n6R?8TtI; zy-^X-)d)NZ{tlGJW!bpOh=bS*4&}}bCOg`qdbvO*p=>Xn)HWGUA``ca^1-~*n1|>J^B!BzF+lDcBP`a{wDwu+ySIfhniC(*tPts@*lmw&1c|wx zJ>(AxVo9q@vj)xUKOBddlhuOZEpK$4ybFGte_sO;)D$pAMz{+*d5@7FVLV|nBShsq zg=zjU;mRm#h3@jcbGYKCE>4l}+swQx#HOf6V7Aj-Dd)r!Ga4Cm2~j2tX|KqV=z1;$ zvn46z0cq*EpIAVfC~|jcNyqiF+mFr0P^2l>jeKng!4FaSU_TJVAU`qgR9N~*&nh`l zb#qR`Somle6y0jjS^iM2BO=Xg-og>1kCD152rdyr@=VV@)x0*J5XDdZD40ZKFEL+|?TskS4b?Zy^Uw&lAakuP**=ax>P5E5;r?@dO9q||JNnUx) zbDZ3sd#3B!P0_YPyoK8Tg%ZMJM(mD^sA#Vxx>*dy<4RbMFy(IDW>!=_s?>m2PG1_l zz0n>t2lmP7avASCXT#}Z^F9Iv7tkbnu1j4u5c_Jnpl8zUO36{MjQ71IbWxsl^j!Vm zBO-*;CcrvQW-=5i^%Ew``fi=(uP|i-W%zn7dE}p34;DwN-!Ua&v1(q7Am zb~hw=?H`%C4(AOX+`s5T_w&CC(*?tL+DOP$J79NfOmLY(-VZ*nGLD}=5Z~vuYJXY? zx(U`82f`MH?iEbnUn$`)i30cCyMtWPwN3Ll$E@$r7BW=b4p5tp?WZ1!S{t*OXFhJW zz|gFFPB=2-djxVs<#dd*q(Ilm!h90(w?GPfXB$s7q2;2!GZ^TeGVUL(Skc(h6&d`A zFWfm@rJAl1E=|{_yToCRY{SyGrRuZ3)+NEpNsM~uOrY=wu8Ut}2v^r@n{I`!e;tlQP`oO|s1 z;TWGQ2l3fhv%?BpDYIjGD$Byx8@O;GcLu&63t>F(FKvicJ4FlM*p*i8P5y%Te{SBS znBG9WULH%#)l*Er++LI8001<9FOOkB5*jN9Mb_dv30bx43ySW zqoTvB3FMMWcmuOmQz_YVgQxE_7LEfJ7l~luX=v!O3CJ)+M9b=h4xmGPv$1;d&mIIW zx*%-NZ%1V~s+X-1fyb%0t+%abci#P;58oY;1>yBu(Jr?ceO6FAwESs0zxu3Tir^vv zp|dt@G#dM(>Y?nu5!)hf5xSY7U^Xy?ND*9Z>j)`t>qBv`Gj@9#b5V4A?p!?>yR}z% zk@zAH-3nJ-8YFvD_~PELF?EYW+$DJtN1t@F4ns53ufv$Q(f9`M@KSg8Ke0 z2Rxw*rA2-W{TelVti<}@1js-oj=Z}72AmVbe0?y!(GV2C?pfr*=>T0mc>(lbH^RWY zXnmPr&f@`Xbi*I-FKS7e0#1%DpMnrRs%)j+B}m-Y5wF8#W3OXUuD{uOxci)R(@o+N zKn!z%{`k%}gSK#e3ZD@7^aPLafRJE;pJ%1s)7;Ij(9F$PMyT+N)%x39%#0#BkWgV* zCYOqXR(;AkcPb&F%Ef#zyjM=-nzN7Scr>8XdrvK&1$fggKo?NclHOmlB2s4z;8*haoY!YPGOUq^c9i&0e@ z75q4?jf`%@>iBu#%Mwm$fSTd9*f&G|RcXBMUrjh?80o?#K&j4~SV?i*jJ( zRw4ZPgMoAUN%|9u_mXJ8nJg7fYhN#Slhx8p0lU(AtOOfxKO33xj0_D|miyNnk~}TK zobFb%(wZ0+qc<123vjy#5)T)Sed{x|4UAJb?4XfNK94ZDyqBNA+q~@1<$k`h772N& z+yzz?bz@9QLZV(m>MBzcTR`D-5o=A16hAGJ7(>**q|uwCkm3$ zMRM~)knm#cMCi=9(mz1eZi{{=&Jhbs=?b@7sKZsdYK%Q^jL~nI=KvC0uQVCn6x(EQ zGiQE@a|}(>D$Q+Z6CbA7dpKzfi>)asEc7kXi!qr0QVs7)OS60wQfh>Yn?IW&Q7~A) zVa5DuK3wTnE!6e=+e^&S=U?$s*e$f>nT@{dq|4e>-dVyWNj*$OP3p1(Yu}6|3h&r` zx_NZ$+_*qhXi6UC6_~)9CXPVtfZ*GSB)jPpCnYYMXc=5p_4V;73$sy%0X%}l)BS#1 z6~2h|FJ0@^pRhIf>0Gu===v(8d-L2XLlZah=#Vy~Fllk1b-IT~PDo zY&kbb_GXCc5cNl!$`;>+**&Uo9JQoQN=77_zhleWvW*N+RpA5DTOG!KIiShO;>CM@ z+x%-_*$(oT62~(oKD(&LyO?7R*1?8|gsZCaHnNVCzBojy=8kJy%!Iq2#Hf#Yd<9$X zV;CL!^`U#Ur@1(fKkvQlwQ54cE8a4V?3K%q;U-Sqn2mgArq@ux$O}kbRRAO@eU`%K zzkGW(F4-m=K;dCad?_GB|glD{nYmNItmyn%@0n%0O3Gar$BmWW8| z5W$lRecAep^%zBXJlxT28}VA=6XO?th|TH1NJD`b}bo>8$lJg=ed0RWEzKE zmmYfHZo2dIMng0D@`#`8lNB#H=sol%lbJn?d&FTUZ7p2&^O3FJtPM2J@-d2`n}BX(JW&IG`g>W zwn!#M)ik!rfxx~5{5|zCw)bpKk;7?93r0uL$>s(s`ef9+VC|!`Sc7DC*s3F0h71^2 z{4b@{l*E-#VYT{Y(tZSnidvvzWEsYk7!D8LC*ZR7yzy>fU`r!G?T|}4&GwL$F_sF3 zj_f2gLEn_bkwE|%W3U3c1#kEg7M?S;jirS*igOH11Amx_219*87Utz(whtD4HP@tu zrQMwBq9rxAB{i?5fuV~OR>{|1rLVnWsrC`ob#oe)Rr4vxSq3@dLF8KRUr&3|s{J}JKL3f8u$=~kL?t4j4`@mpan&4!q5L2Ox=J%}TiQJ@T!*;AK6kkr zJUDerVg)Nt@N1V{KHn6ErN*gFgrTjPWMD#|evp;5R?!n#VT}{}+Y88=$=dAjd;SP| z^FYa=e%q7>Rk>RiPehaj;jC*7D=xo0N3O3L%|2LWBU>Z5n$D^QNQeqMF8TW*Ws1%s z4Ro!ctlXmGtcyF}5vA4%#!SJ#qQiZaM%1uEu--y}vvw)^VRiV(cL<)?6fKPP6$3aa zin{t#mc?iycY|KMpTtxnkRm!Rr&wF2VdV{r9k0Jfs(iD2YPC$8UK^rR^DQ93)Pc4# zArKnN2M%Jk8|AvXVVl7gWE8a1ny9NSYumdH`*dWMecUT>d1m4)aSnBZuZWvv@`d6kaqNK=Yn+sVpv)n`38la8XY z=PtSUivZq@rs9cY%atF5r}wPfdTw`g^MXxYDUHHir4aar;=P#|IP1hyly|@7s&ySp2JQa(K zz3+2H4bHgoCW4RnDX|7D5H=89N=2t+%X7=(ln*67F;X3feawtZps40_P&FKGS&Vmo zQ^eY=P@%qv$zgRh`w*Ggvc?IV_JA}gV=Flo5e>L+wHDKus86YS-|QEsE~`P>l1#MH z6?VZvHFC1j-tBK>G?vhp#u!n~$m)sy@l7N>t-*rW(Hwz?@agr8KIc{zYdvbz{qdpG zw*qj2(;Jed=;_ssLsj#f^Yv%Je=FkvyxfwimwNaEjiYE~oVoO&LC#TLr&TQ!-p8(HGawSGFm&VsD<;q2jaw#jH^*I*zfdXcl5Jwmf zS8Y*UYYN=1vF)W-pK(73T#f(oava}vkLuiwy3dnp(T*+4#xuDGEzmldXftJud5Vp3OpEj9$TPQINle_#r#kp#vy7ZK zOg3Bmu(MDkC4#I*q|PA9{|wp-PzA2gx!B0>n`4>W7!M$N57UTdc* zh;|w4!x|}#3-NFY)SxAcA2w`VUAdIc8Gb5rHJZg@MZ7CQ`}fJCv0i9r`_afCZU7EDZWQqN1YtW{b*d8LS15>o z3(>MGiIiO^-R4*+&p~FIRP&}GWHPGnijN3bRH-^nJ2<%G)}6d~(=z07-5~BHGu(ju z?ZA!DcHd2@M=RSC|BNQU6Fz9~=q|4i7^uglS!U?eB**te<>%_$60F3t)(?aFsM>#a z?ny|zg$(3*4w**v%H95W=LkuBl!Pj1a=d52tiP1cBqxDSHFF&~y^1>`W~bUu&4t~m z=k$oVm)r<3Caju8Qb*Cjv!1tEa3|BhclV)xy=TXlp~;Ar2qYW9uB={dj0)%AGels4 zQQl@p;5X`#znKd0J-sU-A4YVVvCZ5zFt(~caStd9{6<;@eW0m?x#YJiD z30$C(QM1e;=IEil9g)Mg_iHW((J+?yRcGM5`p+Q|ySq)6AVjrEzi{|+8cFf&6IXX~ z&T}C;9e?lPUqP$P?iX2YhFL+CWrum4Ac4i%N7gS)a}J*2_`Re*aCFS&@`^fJRPZ$QCL_Ji9ARoAUtJmZJXGPsK2ab?cS}Tsp}A*aI2lSBRa6>6!Ob^p>J_{ zaXAc2WMM5yQxGD)$sL-p=oB|V5zZP~lMXdqh%4UwtB~a(0vYjS6%;Rx7B_LY7fc>d z_h3E5Hkr8WlOtIz>E~YgD%QQdmzR@k7UU=JTi76oL zWZ6L4=Nujb>j(xG_bFP$4QoCs?dMs6O8dKghHdCCeZS^3R86u{Q^5-vKj*ly;soJ6 zsS=`?s_8s8bl@komuXVgaD-tvw)jwFeJ!u}P|OoL8`mlkE37q;jnL?r)Cx0@21GX= zmAu>)R=wdX`}O(j9jD7C{Z$DUv@*;(vZZ}u6QTbn@Y}-efkMzij&5hP$5%e|{NwF! zndrx>lKDYgj{K*FOyNv}$;~XVvJHwm3W~CuL_R89r7oMgh86}bKm+6;lIs0$-lHM%DueF0ig9xN>GO; z2KLS9xRRZutSU3BGBaxx>$_@J76m&OM9{G&6B_)B8pUFQ$=Hhu0T=*)0{}61;Q`sB zT5Yq)>(8fNbW2s+j{**_J}mH8~xz2$CE>?`l&6mc74U3>Y|9x0d^CyQL zHWKZ?^H&;ko`U*=<$B)#)yVRmf%${E2TuIOWP^+UT7LLafcEEUe%kq8EG1+8ujHLw z3;E|MM*;ZXIrxgt{yt?Y)BbBOs{H+5-gMRYUo5{y=`Zi8E*1jux2G0s-T<+ea~1)m zHSzp^qJmZacT}7z%Yo8SHsdj5kvHS_;L1X^VO2vIFI ze*~~rnLmO;tJ)u-v{eW3pXOH(R+}8jZ$!bH&|(J?0Kk2z;+S7t{m-lB^F0b^vK}UF zwihz*E9swW+kZ&DT(1`8kbd9d;=Pjpr>6Z~(*8qE7Jelsc96dk|6AMw0A&9VL2|Fe zvkv?}+mF4xex#zC50c!Hk{003JDGbS?!17j-_CL=2grvLj8 ze;bP)xJuxAIeDd*lV|y_t(TKeHUQ~qv;E`ZZv|F8lc@X`;{MB<<{t$LW6;NbauA{( z42Z8A;g1(G-FVzToHm|{Ko9+R;HO!js9_qA-~jHQWoQrJfp6vhbr%|xHGuPXc`tZx!OH>Sf^xGd{?{Rb zzP4btym&_P;u*t#+5=#h3cY}1eG*S{PT_W8b(%rd;bR!{M5+eKvzTf-% z{r_IqUT1dpzR%2@Gtca^=b7LfxQb*r3{@pKcoYBt2?;=|ydxWjL5u!p?1HUd6axSN zpg3_2{FGCd6Bii3|3Vg0!ap)b=%2<*_Qw&z1he`m)L_86z&@#h;kTYt4hT6b zwMffMYPn@Q@ZJ7wr%=h1CHHOlv{*H4QYOTVPS8yXwl1H7KOa}8waxw=MrmgU#>mF( z(e*Oo4DcC2uQ}>k<6bp?bX@vhg3V!TdfWb`AF!)4rKQ> zzjyA1qMWHxa)>SS{{EVcLW~DuP}lfOhshLBcYn*n|J?)^F@w9AL<0X_3E>`Wgsff* zlw}l5_F_Hh?MX@=hsz$YB0P4D@(R35J%M|#rV>qQ|B;&}Rwv!O>Na|iaFT6}Qr!3% z4Fa3-o_UnkF%0P#v9UW)~~=o}n6WIec6>syI}5pcrfO*#|8DTrVs#-Z~)VdC)|sCe{0% zAUh-phj5AKJ7cnANQCUznf8 zdBqkK&Sk);D~f+hmc2*)H=Wh|$gID^0|3B>Yk>n$gO5#x@RYKG1TlY8c9cjH5#vwF zW;ckuCd32)?5Q9elnh{GU%VNwd(i{Vl4(jK3He9?f>`l}9(z=v9-#%Uf>Ce>>N8>J zhuqGRjEntJT4Q>59GnH`_2)byPV;nb8&En25*(V8f#h?Ssq>eRWrwM6;S2f7;MSwi z+xC>DX+>SM)0nJfpR?u5wqKqrr*%i*YhLR4F~UH+0zR{=w?OcnWT<0;$(0iDPEqt; zP~O;EBiqsEefxC+WdhV=bDtG>M<)+f0u$yQL01rWk#7)zZ3Poz&lsiepMSb9ooN3! z*$!=IJU@cD!3??MmUlZhlqk-tF{jW0UfxMoo6o&kyR9Z;ag4vE=$QF>m@XhL|)z+A8d9nc+l)gk1Pp@mPL9{xq2 z$52SK^kzNf(T4lA9p>p$i=pUIoMv;^C09tZ4~8q+PjZndGBSSe=ko%dJl=)(BWoXW z5K|;uE$ig!5`z;-?SYl7Gy+XA)~}ONUM}cDMe}L7y#0leZ;{`+f*O(!cX-Pt6V;R= z>CY39m6X7Ft|fUh0zISRi|O)oFImTGvx$sqg?!jR>Zu~%;#BrFq>wvXzRZSnhj293 zYGskCm_hq;ZeVD#J=7y<7d07`Hy4_+sJ%_R#GxlmZxXTA^)|n0K^7r=ozf8~1-vG&#d-Oi z?Izcu0gXHy*34W|dY{c-qY-zZ6}2Jds}&bAF*5p45Ul%>`j_d*SpQGd!fqs5nMnd_ znqf&`Tv^4oY{|y3%y?Vtkmh8q=pXJ>)in9YOZDHz2#RW}Rauw3y=S@9%ik|I z8cWpTAEKwz>w3dP3fXQocY&C;G2##^56+4Xk_MC-so~z5!8EutPWU92u^`acu$+m^|C*lss2me)aSF=-T3YItl1duAPVh5{|3i&rbpv!o!O(Y;S$_ z!AjJ;#f`?gew4vH@ZX7dH)L^AaMgWm_Ef~hxtA&iN1=_G6SQ4r)Tywa;>Y-b=(p>U z=vSS`M8P$#{PV?--uPyEwgKOiO#!$rN0uLRA$`ZY3Ja-23*D2v<@J=o-kZ`UD1Gwg zcCiz6&dwX8@lpuCBK)u6xJU?zpgg6q#TiQ%sVzHKr@G>v*yhTylN;fa7z)*G9^xQdt zJU>|RS%&7WwYO}ZTq6lj(s^*4k_c1EM|JCTRV~ayUkVBkKhs$==pEl>@nV0gr_!SS zN1H|J%-ufXpUl0)m=$eSaQqWCNJQcD}LHqGzYpZZQDsjlcL#Dd4r|CJIVwV#$NjB4=*hI!r`-x=g-6Cvg$smKy#h% z{M|e>OfeCw38+WkIc1-@l0Y{j9G~-Q`_a(kPZOwlMWH8*!*Ys^NTJY!$SqyTZ6gSc zc<^Mn@_h1L;+5CfX}f98T)_$K6HIzhUHfGUGtYYicS&b&B}=MVjYyW;zHv=^q@+kM zI#-^vO3NGyr%%-JkoH6k;OYre1tBFz5Yfaja^t3m&(Mg*!bFMW%T?d;5QY3=v}h6t zuP$|x{VwMvxu%d%aFsq3bF#so=@i*GbhLI^d&YWRQRUoylF|2SU>Kvl4#l4*AQd0y|-X-!v+fLXHVCF&U7^xM_T! zA}zcxd$myOjr7At)OlP?5bdYQ&n!0=3Ny+|c_KIp8HqU#YTX)Oi`?e7UgYw1p1v@@ zNpn0M?7q11A+c%uSFy2L)1hAlG(Ma9G5^`6yomKw)k6}7uAX!kvE*IyXQ*!<%7BTC- zzMSb!op4Tjl+64WSac43Rd{)i$Kychv{Z)mbFfYu9CK-thP58zlsSKxI#uS?*|!Dt zwKh^ZKDy^H@`Qr?vG*BetK#WnFMLLkHwi$w0>mL4GS&=*+&7!qacR=>Uw6S%AyPH1d%@W5Z$ze7jJi92{!5C*;2Z!A0TA;99HaaM}DwK=A z$io?$!y~a-8cgr5)ukC;gVQEFn~}@7kHnXi?H}Z&-OZD5IoM^NSu_%6l8mZ(t1pUjJ@cr^S7z`jy_SZ9Bq@ zoc@lW7~LIbZ%mGlQ(E5atrY2H`AB~LV^WEASCSkR~C-CET)lRZOrsdOf+ z-%8905-Yd>X2${Rlr)FU`;+*}Z?B>ovbMR`eniV^foX`luWyi!{XXXAt?!S$on?&6 zXSWTgFxBGl7=iZ9qRHGC`70Az)8~)=R<1ZW@&0+mEWBfA z3t*eTTziLapYsZeDb*rGc^+d#n}0BXIvRb4T$8-FsCV*9wdf!7E1igq^-}|hBP@l|AphM zkn$+lzOB+RRX4MM)k*%IrB3qof|O9cH9f$?I5mH1s&*TPEIF^W>U9%0-Lc20>H^w< zZFh*feq*yT_QgR=9fCo@P$f=N|3!$Ckx}ZQ$h+OXhVCJrhnwKfyliu9EW?ZDufS7# zAZ_{E4#{;Fq9)A9;n>zdgWRk<70WvuH%lq-cOFd>(x9K{R{O@fA*-e0I)~ELR#Htn z(#1r9eRP1|&ui~kw6bIy+vHyX7EE_&C<@q(e$xhz;Rlbhd@7&%wSx{n;b8=dqIPbT&CoGE%>Gs>w&dhoi@08}fE+Q3EKA^g@XKJSdW5pQL2VYNq! zJO55}{O%&UqE$TY2ic{KemmS9uT-W8cp2sBZ1b$eb(y9Lc0%gyOS@1>BiT6ijPU}&SFTS(dJA}pncAet_o*_Ilhpnw!+{qG#R z0#!~HCrb%tu3_+q==bDpprw1A8$cmwRaT;L6s1vtD6}xtmZyvHFjQy}RU;!XZcI{% zj>pXS9qEl%*JMAwkvC83jOry~;2+tXasgZ2*0_Yy zc*EFsT~GEIr8A-UBnPcnlL_=-wrhT zs1q29-D^oeuuwu|7*aW7MJ6xpUr+r0?FT@v7lG}L_Kr5$!!SeX|NI^teJ=Q0P=`gX z1w1`i;6^vB4lYJrrSAE@BK4fTZNIs7xIHF#)xcpmv~8tmsMoPM`(S){-NPIv z(-BI6*R2uD=72d)0i}>IKM*tgLYovx?d|hDq8nfLFlP5v1m|F{^GdM7{#_B=z2(4S zJc1Gy`HD=wtjB7{BeFqf9>O?fZi$x3T zZln*yj2w$WI%-vOU4O5`%WBAd>ShRk8QF^&%*o7yIWU-UdNIjC9<>hkC5>98N}>3$ zYKrYE94JS9B@LeywW?9=#}g%&Gs|F>m3Ym~Mf%3S|M+#>=@$-B3K{k`O2sy!-lSu5 z&I4vOUwp&J^}Q=u_!UrPO94BtAathAyw=gmsXsC9j;xzTs=JjY#}vincXREMuBFzn zvTMHG@PKluc4g(l2)-Sd)zWdgTINk>1PaWXH1$?dWTl2n^dtFbjOcT%EKoJNBXO&6 za@mjPsSP774s)Rfs+B!;6;>p3V{1@R`%-od`xn(b)ysK2BPy>W34M5&<-$TE+}o^@ zqy@?yhPE&CWl21cwhKlVRZJy2Q{PRc?xa`NzSKHeG_`(SE!gk{{I)?#qn2lZko9CVDUmG2wQJUdL zU)s)}sWOxfdMq~cm2Hc- zO8(64+$j?kkW1QR1&dU?_Ks0ALis=_Ge9t`>ZG_wtSzC^Ak+|bu26|$F{zle@kTT} z5se}Egtc!4S{FqFT{JOI`GCJio}oCET4q^qjiyfqlLocZYfw}XkhjZR$Pa9K`C7;C z+gGmcHfehSMjnKQ_i?6qyYnCgT(29K5j77VKcW?juk@}9F<`{bRTUWmCM#P%K}M2q zWCP(#nq}H#dY2OMH@TQ*H361y@~x*tS;anu%casXga=WLrczR)!w6ahuSI|+e5pfF zi2LC-DGFral#OK@&63hI&b?sP&Zs**vzEL|ooxg6HCsh%993}{ZQ-s|wA5u+ituaR zD%ZI;2=Q@VDuai~IZzOw39M21>CzsN^;N}Ig3@h)n)mH3g)>=6D7qy(OXg5L_m2z3 z5j<^D(-Pq%zh{VMS)EsBg$s;*XM{djB^URI@s{V zI$ssBY%o`|m3=C?0+MT=xGWZ~Z+|WiG|{P{*SwWvc*hv_qfS;-CfP0NLfhqdF9I%U zgU{tyPrwRkCpoxqfyIIw0}c9m-3Jz{W`q&33Zrw)gXyL7`X%)h=2cFF*x*c7Rb(rT z#-x1B`Y1Tyi}W#Zend+wTbat&^3QRj^4TGgTJFJadF$*~%*}q5_&5$C3<}m&ZD%Wiikq^%eUC;pd7qCI0)Ob;BzUqIg&2DY{vP$Y>XQoUXLZ87~jFGytlxzG}h@F>XxV(W@X1h|L zU%QWkh3`r%%Gat6#%&Xv+cbI+EWfmVPJE-T-l$y`7zyWHbU)@4Db|?s0^!23*br3M z_JXiMOB64-IQxf7!n%2ZEjnmg6^Xi>fXe(GOIb4s?SVVZ5tl6LU5L+m9KLU4PdIz( zq{8r`hIhoY+Dj&pA|)BNk3Jt_iqa2${(_PegKxPUnBoc+M-(6dFhzCB)ICVnV@j_i zPIDa;D$G@#dR}aQZdtQNxJ+))GM%W==oENYv;;{_fL1X6_)=?Ntkt{s&RO$RkR5Ng z%9pm`SzCKL8Ztkn_--kqv7Ym75^8rcUDbiGMFy$Z9O68uF-p^Rpn+g*iIEVDKG{`y z3D||g^0;6F_O7G6+Xc-iwuGwOCU(<%w!xt9BBAYKS3l32lDW-zTO1S<7xjZ*SN&Q}3P9MdGODrr0r`>!`) zbdP;MDCx6VeZaWJVJ(G?N-`rs5&{kO@PMg3jOJK=^qEXf1nF?RV2^9U{DDRw%HoY1 z@Z$$(j44S-?bIkn)_m@Es_z#Ys&Pu~vg$atUuyC?8M`*&r0`>r$WESo;&VlsCrY3xx9WvoSI9A%}jpbuEPh zb3e!urn3gKl>_7;*MCa34b~tU-#V_Lhe96qO2w9PEUK#<0G3CRA&B0+Gv{uq|GnqJJ9n zwGU%b2{OEm7toW+`7tToMb}qXgcpntj|_4+ z21fIEVCIda)Fpv^eZA~Ag~xD)-s@@mO`{jBqI&ea)$FYE4Cr6kJ()oPgL%*DM7QQ~ z&QQaPBNY;5mAJ#}n&&HY2o>vDE$7AdGK=?pII9+8dOa120C}WaLu`F#zds}rF&g~n zp$$!16Fil*{&@jU3xXA2AJ0O~gxkx2!gqzg2vN?P583m@Ctzbl+jvI*l~)DqjDXyS zV`Oc`N#N9Pbjn}@30n}TH>XhHK=c{vT5?+MI9?nO+Muh?(VOts=E!YGJdOUWi1O+J zZ)isOHl8QE3K?DS+luI+SSI@#=95cdd?X|?97ap zpfw+AgcLE4VkIMsOb?>aE!0{o$Y?bE@Lq zzTqVJ(?M$ry!`v~iFC-X<>tMkC7%_av;LL#Mfger?d@!WUn%EYyQa`1DJ(=`{+%F_ zFk#PGM0O1D@jA!&2hS6vm>8~Y2HcQA0HhFe>AhF>={gbnx&c~s{Z_Ygy3q%NP%5HQ zqf;)m(0-!?D&#bUp-5wk7*A(tq=vA_LH7n}8Of{4X&{BMFEpq?*mFL}68^S3!XPJ2 zO-3x2w%)dhsglw~AE?!p3fyw55eM$|)aEXgzlH@zzGYS-k)KPoKG(g;jmw^2TRv3b za#;w{t zD7F+|Lb5-<^ne{Vwpy5GhK=~Z?bM=lAwg6xm$IJG>pP5Bv@Xr1Y#i2uVJ#tQuIW+5 z$mQ11pc?oW4eW0?*Vjbg`llJ>QfG2{(R)?EuQ%)5^1EvJ)u!I(vncWIJCT@21mK}A znC6!j{;)F`+iJ+1E(|7<1@S>ru~*9GgDggZEX{?(-g0HMyK#M^e4dl3K!nakd?M_X zOfKGsI?Gb&i(-z+TaLYw2t7}>8RU;4G;aw`DpI`ILIzeGH(?W+wM5LAwTx||Z?%Sl z8{if9a3jozJ=5lnR^LPt1G6?zG21?# z;J5u;jgNAi9dCF)QDvj;Hf=%wmF1)Cl%ULETleM1EQ5{OMET07A$|L_=T|UEB3EjC zuZSSdA+5E?q9qo#IyPxtCdj49b-KZ};32bWA$TT7im+o@R?VtucN?w%WtkYacJBI= zK2Fxm&l=(eX_lna+Wwelw~aPOnna0HROGrIj8ZnnV8M{@%praxu1=BxDeEZ&b6S*A z750KG0n-5{9xpR#0=4pK7v4?}b>u;Qe2d2z3kj}qqqP3PsJB!y8}yNgmRJ+w3TA#W z(MptZ=BI5&qVdJ0zY+Ykh|*R-{$zhU@GAkX?1-l@B)VnaeEg@~TuEaYw_>z|x_S~p ziQEd_rW@K9^TSx7x0aRHFX)YauwC@g6_mhUW6Hgg1tuk>ejv7QXRIvzM9~Npn2o+i zZ|?BiI%uWLlB%lP-xJsN{#1Weq6QX)DD|7FD!3QX4~CeTg_4e3pmFmMCQtor42Vv< zzr-D#`&eM;YMV{q`MVj3(_hzW0ISmR59d5)vfi9K&7(5+ zvZeF~=sdP^$combXy2lx;Af(8o)Zy=G3!u8OQ9G@?c&EL8quin&H1-1zXE|DZYoXy zshx%xuD{|5yjXVW!44)F%`lgptK$p`-EZNRgJw9!UtdERn3KYDIq!-6__1da`nuFg z3zfRXBFuZRMqJ?|=~P9xbZ*$YXx;>F&g=6=Y}DKs3h%Zvf9#8Y_fsGs?{)8~`E$C& zk9{ss#SIKOgU*%-H&7FnOZpOcE=!6#pqLG(49hB>DR)nYaVKtJq(&3Ay>khqi5Q3Iq%b5MOXtL% zciMJ`V$GuA#AZN|h+{AAKW~J~D;XT&maORYQPDG#pKv007&MXw8d?FLP&ybh-$|A* z^uJIGc~OOOU_v3-qqdLr!aag}2hXyKc?xamJo;UxUA=1emx1CBTU0hdVnwa>pYd@T zr0O+c*OBVuK&zF7GJ5$ij%!SUm1JzEEl5K0OvaY=gQTzNul?Th<2but>mi%=So7I9 z#98-3jfexPUVGQ^pc+9L&?lFGzuEQ&qkO8^Y4&6>Y2l9Jv{<>?!7%^pha^Dr+25{# zNNo@jI>|%Vz;qNmSnZ*u<`rb$P?QMcm9p9~)2JFpr7A~dEf;4c7q6z1J30nL!iXIm z`2h~w*JC;Q04Ij{8Bu~?H9NpjVeMaPQ|BNAQXwce$v+&^ThoxIaesrMUsbujO*i#v zPRW={xv)*$upZ4!Wv#=yVm?XXx>!3kL2wBnMz^ufeb?nj`89pYGm^kCSColD@}sma zQiP%lNH+fSK-P&>6t{#Y|BPtFuo;bgy7FjmijF;Q?w#5qblgpEmV(bCFmhp$urAZ4 zD&0DCh2hiBsp;Fyp_}HQegiHxAo)kZm!QHtfKmw|O7}9(r;uNkmF_n82(nJio=&q4 zat3ecnUlR&n~g2+{;$)YKY>C#jhW&92sH)9VX)YLBrZeqnEZ#>cOKphkV)6)5L2^; zCk(my9qf}tX|?lLLbHvBdE|)^THW^}0svvS0D#CN4{wOH=E!am@rlyoN)GoVZFva7 zVf-;g?LDX)j{pFqphIAS@F7kys5L4+g$Pfm8~)$!XBPO1VaoK6tD?T(X z!9TENAC2{o(AHc>f&O}>7E^%pM83^F{;NCAUHL0b71Y5$eH&E@3-{=KeMjZnl=I*PHJ(;(y7EjpKiHw_h}#7EiVw=~4s^02o3B0E8a> ziWx8bqfDjq*=t&X~(y1pY$;IA8z( zbPvJ(=T#fk91MtNYvH5}cRrHa#-%ImI{O_G506_f@aqQv0?L&+QJ%|vcKDLB%_BRe$cr*aQYC_P*voc}mdX#PMZg_IA{JOclz0{;L-Eg>g^N>3KVhlpW~93L(G za>at|k35CDX);Z}_F%!`A&dSrK>p`d8xZIM=^RpiwD8}e@xRlo!|l-(6(2Onm%gVN z)9v)f3m*K=|9|!{(dW^8$?)Gr8yO~sh4?{IOQ|6!BTuyhLODVVYa0StiV*&@h>zC) zDLnu2?_sPB5DR;-F8?Q%rxz!43Lkbz$aYQgDxuT z?`l7T+>YWr8uFxD2N^x|#1W%DRFZ!TIevcFT9N;5tIrrQEJMMA=WPEI_CM9^A2M6< zgQfrM!Z&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,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/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt b/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt index 52b6771..cf85585 100644 --- a/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt +++ b/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt @@ -6,4 +6,4 @@ package org.jetbrains.bio.viktor * @since 0.1.1 Renamed to `_I` because all-underscore names are reserved * for internal use in Kotlin. */ -public object _I {} +object _I {} diff --git a/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt b/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt index ba8d123..088b740 100644 --- a/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt +++ b/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt @@ -140,7 +140,7 @@ open class StridedVector internal constructor( * @param reverse see [.sort] for details. */ fun argSort(reverse: Boolean = false): IntArray { - val comparator = comparator { x, y -> x.compareTo(y) } + val comparator = Comparator { x, y -> x.compareTo(y) } val indexedValues = Array(size) { IndexedDoubleValue(it, unsafeGet(it)) } indexedValues.sortWith(if (reverse) comparator.reversed() else comparator)