From 2e016d041a0f4301d85f253b2927da1e30f42abe Mon Sep 17 00:00:00 2001 From: loki2302 Date: Sat, 1 Oct 2016 17:36:40 -0400 Subject: [PATCH] Added a dummy Java extension --- build.gradle | 6 +-- buildSrc/build.gradle | 15 ++++++ .../me/loki2302/DummyExtensionRegistry.java | 13 +++++ .../main/java/me/loki2302/DummyPlugin.java | 28 ++++++++++ ...sciidoctor.extension.spi.ExtensionRegistry | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 52928 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 51 ++++++++++-------- gradlew.bat | 14 ++--- src/main/asciidoc/extension-test.adoc | 9 ++-- 10 files changed, 102 insertions(+), 39 deletions(-) create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/src/main/java/me/loki2302/DummyExtensionRegistry.java create mode 100644 buildSrc/src/main/java/me/loki2302/DummyPlugin.java create mode 100644 buildSrc/src/main/resources/META-INF/services/org.asciidoctor.extension.spi.ExtensionRegistry diff --git a/build.gradle b/build.gradle index df149c2..3d50e1c 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ group 'me.loki2302' version '1.0-SNAPSHOT' task wrapper(type: Wrapper) { - gradleVersion = '2.9' + gradleVersion = '3.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } @@ -66,8 +66,8 @@ asciidoctor { dependsOn jrubyPrepare, test extensions { - block(name: 'dummy', contexts: [':paragraph']) { parent, reader, attributes -> - createBlock(parent, 'paragraph', 'Extension says hi', attributes, [:]) + block(name: 'dummy-inline', contexts: [':paragraph']) { parent, reader, attributes -> + createBlock(parent, 'paragraph', "I am Gradle inline extension (${reader.read()})", attributes, [:]) } } } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..0f0fd59 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,15 @@ +group 'me.loki2302' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' + compile 'org.asciidoctor:asciidoctorj:1.5.4' +} diff --git a/buildSrc/src/main/java/me/loki2302/DummyExtensionRegistry.java b/buildSrc/src/main/java/me/loki2302/DummyExtensionRegistry.java new file mode 100644 index 0000000..cde7b30 --- /dev/null +++ b/buildSrc/src/main/java/me/loki2302/DummyExtensionRegistry.java @@ -0,0 +1,13 @@ +package me.loki2302; + +import org.asciidoctor.Asciidoctor; +import org.asciidoctor.extension.JavaExtensionRegistry; +import org.asciidoctor.extension.spi.ExtensionRegistry; + +public class DummyExtensionRegistry implements ExtensionRegistry { + @Override + public void register(Asciidoctor asciidoctor) { + JavaExtensionRegistry javaExtensionRegistry = asciidoctor.javaExtensionRegistry(); + javaExtensionRegistry.block("dummy-buildsrc", DummyPlugin.class); + } +} diff --git a/buildSrc/src/main/java/me/loki2302/DummyPlugin.java b/buildSrc/src/main/java/me/loki2302/DummyPlugin.java new file mode 100644 index 0000000..0987213 --- /dev/null +++ b/buildSrc/src/main/java/me/loki2302/DummyPlugin.java @@ -0,0 +1,28 @@ +package me.loki2302; + +import org.asciidoctor.ast.AbstractBlock; +import org.asciidoctor.extension.BlockProcessor; +import org.asciidoctor.extension.Reader; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +public class DummyPlugin extends BlockProcessor { + public DummyPlugin(String name, Map config) { + super(name, new HashMap() {{ + put("contexts", Arrays.asList(":paragraph")); + put("content_model", ":simple"); + }}); + } + + @Override + public Object process(AbstractBlock parent, Reader reader, Map attributes) { + return createBlock( + parent, + "paragraph", + String.format("I am Java extension (%s)", reader.read()), + attributes, + new HashMap()); + } +} diff --git a/buildSrc/src/main/resources/META-INF/services/org.asciidoctor.extension.spi.ExtensionRegistry b/buildSrc/src/main/resources/META-INF/services/org.asciidoctor.extension.spi.ExtensionRegistry new file mode 100644 index 0000000..41ba85b --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/services/org.asciidoctor.extension.spi.ExtensionRegistry @@ -0,0 +1 @@ +me.loki2302.DummyExtensionRegistry diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 941144813d241db74e1bf25b6804c679fbe7f0a3..6ffa237849ef3607e39c3b334a92a65367962071 100644 GIT binary patch delta 13222 zcmZX41ymeMur@57Ai*WLySoN=_u%esi!K&i0vp`j-3b!h-CaXM&_K{2KY{!1efi&> zvuA2+zml%*sp+Y%;5?`=8BoYdvQW^kARyr3A&$-2q~nk&;Qw43tAu0Y_%yK&aL=57 zIzvMIhuZvuDkg@0zK&A8T(6j(uV7lp&1a$x8Q=_fVFg3)y|C%(0@E}+Ys=4=P6zuU)%7tt7czovd$-RLH-0m0I2=8E z-5{!hSd2J#vVEsXF`uWyplH2_EeS1v=d}}-Bdd1_DpNIpK`y?}&iz&P_2YZwvaeww zMYN7;1hIWJh>8P7#_vQs03WzDXfG2!I^ho(rb~ouS3BkcdStTn0^(@79d~g0*wjyz zW;bo9t+;8b=@$}~T*}GPR@}-hK$4P|+3)m@gFUC^mI~RDfBX~}!L`LK9&c8d;v(pr zsFzjA22D3fS(f&jS5S%Y1pOi_$6iWa-n8ryZ$gu-_(A?* zwe3>o#E5atjO(cIKC0y?B0S(|XcA>ao~C2|6r^#+z?a~W;WKoezf;6oXh#=WAz#;a zjK@uKE|_5Dx^%wcd)u6rY|AA?Kl#R)S1p~0l|XX2?+aiJMJ zVnGVu%zCDaSG>G+Jd^~-@rRT*jHjwKyvl_Ke#sJk>7ljw|zXSF^2B`SFb ziq+(^_>JjMe8ugyjaV zs$K>etpUoYeW_e&Nw!qzUrYKwxM6bJef>a9NA%k6!d|?YeJ;G21Fz{*7~K7|1|lP> z5t#OYxJ7Plxrv%ish*uVCI&;w6+Al$Uj%TQOtBFME~4A0 zUfl_C{wC_)AdG)QqRredH&QeL>7UZU(v8LG!}SHs$?lWCW0F2|8Xlv_QnBh_=-;Ya;}!)HR&u7mF!2F9ULIl6;oz zZbc76`us1(5M(ESQ%PjDO(ptjJV*7mE3Yb?xcf^u*#r#nibQLA!?f$jp`Z@DcUlZL z*F9D3RLMNBCf7+4v4RK~mQ`YEUE)6{&>;;Ss^sX`?Y8A$A&YwZg;;c;mDz)kW9)&` ziRQ{v@4fZDW58`E>)PTL(}BzaUY0knJaAZAmE}ff}(z_>e=)O~XdYO(SZ?zY+O+ zP@K&S>Mpt%wzpAQ?3PQOm^U1x^(b!1uOXLR%Q$WZP{+oYjSrK{z6CUvw(s$m z&gy$ZMuWBHg(!5I(nWSF(-PZ{N~I*ldEF7{8f{4RQi|_z3EF0D#y0W}qdbpa+h+9+ zKP0x^Mm7r&$cs@qO7bR#$rGbG8a#3cZ>fh3dVfcSiyF6V*e2W?uav{_o&%F^ps-y z`c=g>tlf2{O45`<BP>&>%~n9%+PqE>O4pod$We4!dEj zUrFcSs5y++uRAi${qOS$iSOSSAlH76g=U-s7ln8yZo$j?qBswuxWZCiJ;43_P^zOt zUVM4Ln0k$F#6v?s2q1t_QMo}nsygZz51i86B>2Pa>{2@U4Z%7pOi~o}v>4==01Eg5 z{U0Rhl%XLm+e6Zj4i~rY4e%{~1UVp&bC1s^F%L%hUP+d0D3I>X51ZCrF5CEeA2oC~ zEGRtO{*D!bYzuSn{oa=!NJI34dB4X^jxPCU7g@B!O}3$i0;$U9oJ~6rjLWM%U(4=% zY-JussT%4&c_KA>X<#|(2(Sp1PAg$Mado#4+eUD;|FcRPRo`#4TVb-}O;MQCK(~O# z#rL+JUJv8j)7_+fzvOnYqFvIKeHlJYkBU+6Erz7Pzh;-$Ht(O3vk;dxa|^gd=wVN{ z0aSkZ65;PXyqw+OInI0mvUIo6Yf5Uk_{12b?ZnWKyA+a+9c@o#WeOegjh+uxW^q|U z2E}gWJ#WQI&Z2$)R1=n6B>KQ4TV1Mj(-_7wdaLR_CN~jvzKvE6E?Ge++^d;#lYEi$ z_o)YMAwwqLmlORv5#O@RXcujg$}!iBlYvZ)yr?RR2zpreUDjqiK)6zM=t~T1uERX< zwKisVkd@u~#RFpE@5y59ZDJ_ELJ5My+V=9Ip38t}@m|KdL^%z@o+L(|i+!{!mbXUx z)H~i>_e9_FzCu!!M(WzN^!p>RkQrGk%$rB;Te$dcCwC+#H0*c^4ak2b+HYT_>>O~s)0W zDsLV=8)E-jH@VSnH0SpNfl8edy*+33KFVY1IF%Y0RZ7zmsU0$y#t1}w z7;Vg}oU+A!WG0Edu{W3+UO{3c|MG^wFXao=17pfwEtn-{D% zfwABLOUj|`OtBlzc#ra1GKC|d9aeYThS;&7{|p_b_ndozh}AzS(u-)|b^2V_MAb(W zsIL_7Met!HCpHCpPdufB%zW3sOZuxYKrs6Y#~|T!GlP_M={thbq&AyGXDg0+IJlC7 zeoF#F2#LByMepxOK5KE`sX~>%7*}dA; zv)C8-!UMwAxO(8h@j}GD`7Ze}9L|YH=$0kKiG7+3g-D$5t2WRHd2F{P0r7UofJpn` zn?+bXG*683TPg-4w7Lk?#d<;FJQUmuxCf&fn5s?9s6A<2<9b0?G|XK_qhD`4QkF$s z(U&B>?AjudPFZQ@9E0d2_bD3cW1N0%Tj+M#(0`yJ+HhH5mSt9^SLpJ1+Kc!=8Wdeh z=zE_V{D1k27b_Nk`e%b|d~HSd{b_@YhYSHh366ut0-xewfehX*pguB6z1J?cqc`C* zlrob;CxI+o>$j8NPNZu@gZ@O*1pdXUx&qZ1oZ8+hFXxYhw5|)NALr- z_-%c}#Ngc$j>3)$tB-!49i~Cpb|ee=sS1Vx+E=ELQ%sg$>Tw-deG6s}5*Qm%+d3>h zZ#PiCF-iVhqwb)hGSK+xiz%e!Xxmy}iA^Ox&@k2zVFOB}hj~9=i|CzO%onpo&F$vt zXY1@`?Pg_U?RPP3Yj5pltMrQ&$nqr{3>Jz7U50^aQj4 zuFLgNDZ`+>R3oMzHsYdpudmJ4IL!!bLspT%#lMSW-AQ&n53kl&gu|Z}vck?Lpi+rur3&eRQpL!r}P0)1nM* z_541-8AtqfL%CF#9w*FSH!?9b`Ze+%eBhPeTo*kyE0t;%D-BLCuT1!B27b)Ww<;rF zhjVAXrkv;Gl;w&pVOXffkKOzDwI=T)5{2w|;OOu43%Egso-z6{3lww<`O`$0-NUjwA*K?I~cpjr={lX4#&9_6Vh z(!yzdND*@xNu-tjZhIof9lQrSKU{`pD{ddKkA4qHrzckY8`U)p?vUkmO1Z>O7o^TN z`$^4tn|FLwjx|5&Fgxd&gS6LwtnQN0`sHnbnyxbLCQ5Gr3%=*Vf z=AEMhvu`7*qqeI8EhW2tVx?$I&ManBX;rpZ9p2P=L^QPMH`wg*y9|up`vt-jSTe+b?sU6ug}i)x8ohiG?xD` z|H@MpPqsZgOo!vAAt#JbUn}Fz2P~8nQLR{u%Q1JKrncrAI6lN z2qKKU?qNLKw9%|qrQ#N7V&T-oxE7x@71;uaV@UZT{8^~kG}Vlftn#; zPQH~QNmmM0TV!m<`hIl&huhwb_0Y8M1nox?=uU)9qxwGh%k6h6_Th;V1G#W;nzcL)>#J2SEl?c*sYjjVhvWn(r|~cOO;mOw|=({ zT<-T@?R!lt?I@XI4``~aZ5>M?>G54SdcE07Hl+^YmXS~-k)IS@?5@UM#w2nTs9#AY z6)4B_%hESzTn7H2Y+(GDs9Jpup-0Sto_~g*@}@AO2N(-|zzssl536pE zK<7wLw-Vb9BD(B4VW&97NB3CoNj$Tgtw92EV<@Jc#TRcu?(*B(ox#GapPZ(rQ81;(@!q1+dw*Zqr9k;8C~HU4ROxzW ziwPBbu`bNr4z@q3*j_`@-_~bWWL2H1Pbb@{%X|z5H6G`@Cc5A+p4IA7uNu7Be{)@1 z!r<;TI3U_WBHi_+K#&)I8TZF)0nNT1q*y9kTpZbCC(EdO@ZwJW`XER~am@xL(+JUI#vW*N8M^AE|#pLEAc_z>MG4lzzQKyk}9qmRdn?mLIY-O6W)HvA^GqTTJ^l+n&^)!lO zgMDp#YLX4*d8URHAF9}baJqB-k)x5Fm+7CRHZ4D_U^0#~P;&<=!>|#f|JMJ=3n?QY z*`>D%&ZeX8{%AHa{ zDASO`OtDMyTI<~eneo%8=TdPAB~^m>-0^V^S@+s$0YE z8a;hK=)Y5B*VurItc#}5Etf8QPp(SNGpPoBg8B-y{9V!G=Fq{x!lSnoQJS>)TZ<9j4~JzA8G-b2&07G@0J@Xrbv;|*QR zSaumQ3=lSxZQ4$a(c|wU6%NhN%^o9x>|-1|9iFl4r~6)9_GIkMC2__T zg*-E`<={77h3OMiX6*BQMJFYp?uU3P$xu%5im?-E*(nOT%9Ux|lJ@SH@@z7WWWrrXAnhVT5+ zks!CB`u?acGG>?AYeVi`{Y{s-!cfsQwjgi+XK}gQ)oXt1Vk)41O)YSa#TQu184LhgAz2uz0sduA}ScP z&uVc#vKX46LBa-;n;biSnB^>NzQ}pcIa?TAmpFfkrcI|o_r+>DxPENvbG?jx zvgpP{4_xx^E@HvnbC~rT<|;w7UKf7Qr_flKpZpWpDffUXLBd`t-~%~I)~oFqeo#p0 z1ng-GvET%(Pe5NMwF!1dFQxwWT$1NS0&&OiUgsdd;PvJKKd5u?&;sf@B&r=4zU0En zxRZu>%YdutsNT;XA*>6Y^vUPq;h$aMU|r?oW)@_f<;ujtllz5;6e|ONk)bkCOn}S5 zHy2kgC&1^X)IDuamew>|?xs72!H&Ry389xUM2Iay!8XO?Guo%C+9gMLfWOgVaRPMC zH|YLRv)&7I1_2$5i}0rUN&>+yg>f@-vI}Qu8cT)P^a3++)JNbOB(st{uaHBBY6`c! zAglOdS==RQUzzTC!JhOV$*gm(5(nHir98X~PTiTGKge~dF{}+v=k!bWkP8&me{vJ! zvSJ_AM)*vYu<0Rk$Wv7C$~EeX&zeLkz0Q1*MMFUMC@9z*xeVRbrg%cCBxR?xgzd<- zb|XeVf@Wz8g0d99f-m2~?VviCL0!W$)cU{)0gb@MnL>D?y|E2Z}FHGyvvF`f> zwuW?TYsp{y6w_h>!V+?N-DiUuI>H)tyb>W^H-IyVF1duN!qGTc*j=b=&ab&8C03AD zQOUTxA3-d$uH6Z+!UD44WhHDBLWBG3wv~oUD{xT26o5d1wtdea?Q%)8F+$DYBNzoz z{#rpHJt|#SS3+N^T~{L|imGaanZ8zW?4s;2&iZ{Sjs0Lzs_L#qUMMoFND~P~{kn8c zZ~{8vbrTJQqUv{R+ZvO8#GAI@?r*wK>Ro$-#-N=>ucb2X1|Gg_)?vX|7mvtK^OSQU zdm6FJAWbQgOeJAeKE3RC1y!CX>C>zlk~Hcpq?sQJ=brI&d~{UeXUh~#wWV(wSvrD| z9zUB7!gxf>gsBa!n0^+ur}N-|k*5D>U6pIT?g7NnIDMsG@Sy7sEdJQ=3%5ee2yHt? zehb731ja`pI4phIKvQ@tW{yNxo{=}bB*CHDkC(m~g7L)-W~1*)YwN1yXw~e38VI#s zyh*KJwTa_}$=|ydV=UK&aw<9vc2BTQN?pLXgXhB7efO|tDvybVFqf)vYLa-3z?QZ; zx?3;fpis-4x5@D~FMG3yzK}onTf8f3Y6WP^V)WhSj;t6n{Xbi$pYz&!SLlDi_~7{wiI)wOaE_-TRC z8cqbVW>jwTD+_wO=4aA$a7Acp=IvCSIc-Y5>E>9`bLhdvY+VbkZB#+n0x_32M{NXk8?ihlcB#gFj239-#md&Ms#r3ZK$+Hk5PAK59$R*6otuwVMh_hx+#B-l8fxIcaN z`_zHV@N5Yzi!+HUopHOK5y1>U?@8nL?S){lJon~c+t<}<=^PNUR`@%KOIHU#Ubm+P zB0`QorlNX){>2NZ>On_h9d;=+ngP*l%cx`;?WY-P5kMIb(J`}anqdKQteO_2=;%f z;UJs}LqjtWW=NjGlxx4cx0JdBwFgqa*Ij}PbS^WrJVntWn5wiN#?tGVg~ zb;r2enlDQJEia?R5)~=9De5%QpfAGmj#gx9QJuYiFf6k9O{783@OR8@j4Ae5bz|K3 zV>A5o7*qVQSl$j5?F+P*^Gn`Wi{4i%hTZ2{4i5I!TwJfZIK3Uf?M>Q;AiI{}M98gs zjg{Xx-W&R2zi!QHg`&Ql@{`7F=xHhJxSyGm-QTVRBrHl#t%<96f2X}d`zF|W>V}Vrlp5cH&Ir(Qx+AaI?k&y{@~W`f)sdZP z!Ao7Cepe$H@&1mo2)dvL6U08Am*L*1{C+gggi)iT;$xT}*S)g<-~nUt9q(dKx-&Y*%5P)L>QuvRqVb_dxK?OL1*@Z7uD)VscRN3CH&V!ZJOJntJRW} z4EDO8!h9fPwS`qtM!2AuAT)M4-fw*A=YE0)zQAF(MFU>`4^~u^xU9<)Nw`f7MEsjJ zu^cn%M6J4*C!sWnxaFX1Xw%-c%Mz8q57|4PCecWTqND=e44Lnj%bCB$z%ZbJNWcE2 zzRT@6DBWquPI*&2T0jxj!21@V5t#y_b& zPjTjzuo|}!wuSa1Omv148{--5Vi?+ZgX&0Q7=o|;!{%*iyb!E|=;vr#$L{@#R-$g3 zfesC;rQG~S5tcU69%Xqtq~6*Oc8@TBmrN1>0tXE*#G zktBji;5T73aHPZJr3hC1yP(>_NDz2-d$8hMC3sm<=i*$+?Utug>g7FVT;uB#*0>S& z<eD7A z(QxPGN(DxqI>S_fPInUg+GLLPE4DeB2V%YNffa!ZCB+}LFoEs-ZHj$wPbFX+RFseW zH_DBv)=51()EOPXBP;5wu^!aGcU^q{;hK=dU`5g*vHGvf@Jx;-fOpc1Gf-H1DoU1FNKUjuS@~ z?wds){CZ*?O0TgxDmMB2d^FKOihWlg`eIK_Fon7lG4JI1Ap97W>dLAb+RJuM z4MCC{TWjs0HG)v@D|n9V2ovA(G%*kklxAmfVk>9SPR9k##~x_cbqe z;XEIwhgb9^d}@}p40?(&@dgP4HU2-G*Yl`gh6$pIao2I9arqgD6jS-@b0uU%pg-kX zy+2ak#)>@{`qUN6(c&dxJmr{%8+#CrYIP|1HZ)3x)O;HnS2|Gk9N|{6h@Py2iHf3K!tw0&(Nr*o4bkBhC|I*rL@ zO0LQ&aZw-DRtD@Ac07hsm&T)E%ZS3MpxMUp(lvC_Xd3SYE<1lApNq-QtBDgNGZq`D zpidnW)EpUe!&U$T&Z|JkeW8lkp>*u%BDUr z#)Co(HmzD|H!`B|9@TmC-_G=|a`)#?p32_IbX9TO!FE!NI|bzK>=z4X+1&_LW`}HS zUEw|W3(;PKLxgsia(qY{X#&)DG#&Yva@1%Q;oHhFpDKgvq%oV{`8lhq|e8?jdYk@nUNMlxg=biG&_t|UM;dOLMt~MujZ3N+775= zdV}p|I!QrmsyR;JlQlGEjT}0*w6CwERUu_!Bqo4w`IlICy$BiX8ma|pFe!^b0$!1Y zsN|UGpgLFYI4W-{`%Vsg+A6AmS+Mm&fpwaBfz?TziA3*ouS|`M45F2B0|qwY3YVwJ zbjxs^PrZch=;UQG$y~Lca#_BOafMb<_(iV9ChM7_jXbpxcAAp) zYM5B8M0A`IyA$Dqd_?h#m_Vh8=Or~$lx|uI<(e&u{O{g`1@dS+C9yn8&amjVm_XZ} z)Mn@=I%9AfQPVWSHwMahuR2?lnq*IBW+#)tg=~*jtMZDnEX5rLPCZ|yD|`^jp5YXq zp5!-b*>=YBX%>OGRDAh?=wLUJxmusEa*pi0sS0Pt6?D{}KlBeKYMLq%oHz8l&<~Q- zMH1>v6&rnZ?<<%gD05U&TIG@0{Nc$SfzMbT#c<*2%_CM&p`m>NaJy+{cOUy8i9kE@ z8A#k&$2Vtf(%GN~$L*1Hx^w3q|x_!}>3O#Twp zzuBVc-sj7-(D&_1bgB7fnRpTii;{Tb>&~T0K{=2`ySMql;!8JTt&67O**Xsk)6lV5 z9eX*U9&+gWX`I-7XKLv}V0DGPzR@qd73*)3GUs&W*><%~+?>{Jsz%*9k`oe=MW~r$yd$e>G2!W=NUDLajKf`9b*cE3NA<1DVYeX z0H?z(pHNd63h4#;%0dV{e4XFXwFC)T%kK8E^&2Vzv< z*B#y+;0H-&WY0+;jB^bLuEIC;5W2QM-SGkw@#}@Y>o?q4-|@-D`tfsJ8M+Lb_M)3z z0ilznVNK6d6LL}(RnE|m78h4{;!k8A0i))2^8AU5N;G@h^gD{Uq?8+=6$}D}? z>0p)FV|UlN)F%Jzug4WK?G5(lCh$7!YKG^=zI zX7vVE_Djk+G0?=KU8auGE zVpvm;#bY;w!K=Z1Tm4pkQL#ubNdDIt7EW+xw^=jNiX&Vq=qIV|0IqJhi)Di^*YR~I zQ1WO~pxa^x=UzJyLF|SC>g)~CM-we69+XXq-mnHD%5AC1Z(OIb(u{q(j_?CN!lH$RH0xc_lKyEcHvYSN<#k9{wtL}_hk|;T&IDFMMJ65JrYvcNmIW|%`o_np3l95;k|v_oWv>BiM%4UoS%Y;{?jGhOlDM93dMkH+lehp!R%OY0#ZK2(O;Yt3NNEPjdH1Etw3+S zEoUf;?`T<_Go>(txDQ4`<@L8lWOYMk4zJug5=g$#=MZ&&n<;)PLpfIW6TkcZO#Sf3 zExV{z?*_>aJj;=6Uxyxa>bi@4$4`qxvuks6Qu6Lxu)J)GGwnurCRM$QlRbHr(H3c6 zk$$|o9S0pXOn3puyeHy*)7DRRO%K^!GC5*`JJUA24-Ez~$9_>=KNa^zv>>dLrOJ{c zY*NOff7vDLcLXXs7%d+gbswA6%DjC`ofDV1F1%tEZQXZ%>eH=>dJCYeAvUKGI2GZO zpjq8tZl6%lyR9Knitp<1Ryrc5Wl{QqZKZNoFTJNto`to%CR$Qn>E@&-y_uD``Nl2g;m&>4%z^9*q5f-x=2km zc%(nYzMT(~280k05cuFj16ocx>fs3)c}AK>c_taTA?Z2!@u6K>+A+GJQTYa#|8<-) z`y{#L8qDYRBpC_;_A?{`4GJK4Gb6s+63`SD;Vittt*v%53V2OkLq^IWKbN0Qgacf; z+E&K$OQiJ;ZoPS(4I7GVlpC&aDqo;sgUjZfFUJXcq&sNKk=DCUYs>c5+!+r|Y;?SM zn#gAHwhSq&XIi}7?4+QgX|ity_pyVBWB7rO=)Zx^LOpo|1{%>p|8cFZ$S4$m`iEjQ zFpDjGa`OArml{0fN)9$LZF<2FnmqtsC}PX+|4@iF@sQ7QLfDp%18`4+d#Zs7Jj-DW zvdyr6FVZy;Z& ztH9ZRbWB7{z8GV*)ohdjKtMo0NlQE%8yKaiyNOc!$1CO7BD5FbyPVU1c&GUr|4=hU z4bU(DMwJ7gp1p7UQtgubq_Fg<2jq|Uv|zjmth$Y=+ih3#PHK88Q-&Cv12e`#3{_W%r;3Vv_FGJdF;`|c#19B)0YSWEI&m; z{_h(4`oC8WBme{Izb+r+^oUwEI_C-~bJ#uoy&i{ph*=@NJ$z+Lh$#BP`U z3!%|1_d*nQYySUj;jepCiT|wbQ6zndxTiqeJOzT`$;JQq)CYtig9G~T!Kpn&&%pmW z{vaTj{|EJStq(9oeF9>Fk9%ldtiA2U1BhWg^YpL~!CJkD&kFu(x%o@M0?sq|6bBt# z-i!F6r0q!w6!A0vs2BHH!Cyy`e<{#qdj|6LQ4;;1^88=GM6iD!*R!&J-(hi{-edp5 zzbc!I00s%qt7ua3>8CSefWH~|=Qs^mX^8aMk?&+k zXOd5`kbPQREdRRkXTjK7J_+N4D~HI4{&@UXCix2p0LKjxfZqV&z!<~SFNWR?;{nK> zpAG$XeFHumeHrzx@f_9GlOg-3j3o4z4hc7K*RcGvNB`xYr>3vJK*7Lgj}*KS!7cqS z8q;lcCyJijFZ@4K`QGo@eA&o9u^S!118Dk#Q_D%guSQ?e5SVxr55N=#UW?%W6U%4o zf90^htV2aSS(o}VmX|T!Jqg!DJ@H7vykq|;R2str=w^Y9+Ni;w#&BP7HBUUH+<$@& z3%(medo~25+*UJuI=aVu{gjmcGQ?K!G{XY_&93)29^kO#$#cekhy7P#{7d+({K=B+ zKeI4_2l!g`9J8uglz)dPI)%0O<0)P~PnP-r5*Dv{0+WH~C;nM4kdt_T@CGo!q~x>9 z449UIa8J|s`N?h8zXWxgo&_0NQNhf^FM<3k>HY<-Yk3Ng!1F!xe^c*&$oc^3_NPS5 L0-M_Yhxz{iR0KPg delta 13888 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 60b8b91..7ec3ac3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 28 17:55:49 EDT 2016 +#Sat Oct 01 17:33:46 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip diff --git a/gradlew b/gradlew index 9d82f78..9aa616c 100755 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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\"`/" >/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,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,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 @@ -157,4 +161,9 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then + cd "$(dirname "$0")" +fi + exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @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 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 @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@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. @@ -60,11 +59,6 @@ set _SKIP=2 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 diff --git a/src/main/asciidoc/extension-test.adoc b/src/main/asciidoc/extension-test.adoc index 37cd123..dcf1694 100644 --- a/src/main/asciidoc/extension-test.adoc +++ b/src/main/asciidoc/extension-test.adoc @@ -1,6 +1,9 @@ = Extension hello world -[dummy] -Hello world +[dummy-inline] +I am dummy-inline extension input -End. \ No newline at end of file +[dummy-buildsrc] +I am dummy-buildsrc extension input + +End.