From 7f4909dcdf97b3374d44814ec15545341c2fcd6d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 13 Mar 2017 23:18:10 -0700 Subject: [PATCH] Updated Kobalt and Klaxon. --- .gitignore | 4 ++-- kobalt/src/Build.kt | 5 +---- kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobaltw | 2 +- libs/klaxon-test-0.1.jar | Bin 1570 -> 1610 bytes 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 80a944b..033167e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,8 @@ **/.idea/tasks.xml **/.idea/workspace.xml *.iws -.DS_Store .classpath +.DS_Store .gradle .kobalt .nb-gradle @@ -23,7 +23,7 @@ /project.properties /target /test-output -Thumbs.db ehthumbs.db kobaltBuild local.properties +Thumbs.db diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 5ab5a2b..e6f65bd 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -3,9 +3,6 @@ import com.beust.kobalt.plugin.packaging.* import com.beust.kobalt.plugin.application.* import com.beust.kobalt.plugin.kotlin.* -val repos = repos() - - val p = project { name = "klaxon-test" @@ -22,7 +19,7 @@ val p = project { } dependencies { - compile("com.beust:klaxon:0.26") + compile("com.beust:klaxon:") } dependenciesTest { diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index a4a0d68..58935ba 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.891 \ No newline at end of file +kobalt.version=1.0.11 \ No newline at end of file diff --git a/kobaltw b/kobaltw index 287d453..c5186d5 100755 --- a/kobaltw +++ b/kobaltw @@ -1,2 +1,2 @@ -#!/bin/env sh +#!/usr/bin/env sh java -jar "`dirname "$0"`/kobalt/wrapper/kobalt-wrapper.jar" $* diff --git a/libs/klaxon-test-0.1.jar b/libs/klaxon-test-0.1.jar index 72451962b6b2b557b5d695067e9f54031f20dc51..059114c7030d9e93c37e58cc7f502cc3114ead28 100644 GIT binary patch delta 1276 zcmV@6aWYa2msZ&ZAy_2Mg-NlZAy_?D1UWT-&Y$&6#iyIvdI!4 zghC6H8Vj^(fGk06wbWXqpeYGpgDB#!Nf=?nW;Z80LHgD|z`w#LAGHs{k#m&O7tisJ zQtxaMAcUT?J9p;ZJNMrC?zgl5{QJkB0On9+h?m@oDGqt1Y6~;ZEoVjQU<|P`Kj5a# zon3RSSQaJH27efWRbKN1!<}UA++L71%h{d3m%F@Wo?$%a)^^RZki{Cs_Dt?LuH@2k zX};>p)w*qySC_*pB8)J@t$kP8mSdI=DyHQ~QFFL$W*wEmvr3*0gW-BojEw$f%QcrRTV$PT zT~Z9eD>~u~p+}Zu$;S+XSD`^ku3^x?0EQR>$;SGIfqo1#47B35#T;em@d2LL5kK&{ zEg9To?hW-d57r)|sdPwN+EZ@QTx`hsY$r5VbS#Q7+)_op#SoTzHTTEWs)*ukRe3jV zGjv<$*?$;@b8i5Mni?qC9z*|y9E&#hJhH?);c6pXL#N{&L*J#{I;My&72*=ZP;&b! z+{w;syIvS3LqrNsrpun|gpr9Nh>!sd?=akG@@(TpRV;E(E*+LcRnbz%dkjw;qEn*e zlQmHkH1lLax(Ua1W_**RZ3${j+HXv{(U|lz%74?qF^mTW?yJs^cC_!@OUJ|ZbHDJU zARas-@Z36efA9?6bvj%N+9)35qX<64lM6(;;GpAU2ED2jwsVP{tLM zVwqvAlWFIrQiBGrKwI^Wr&-scyCW0_-4eGqdClTQTWqL-*p{;#v0ASb zMXjmnDM()0&+}??J^H-vNUK6rKd?NDRDTQS7aGIFW$W1`)#hdt+iX^*MAE6g>|FJ5@W^Zw2>+#TC-(iDv?RF?43VNBb75U z z=}CJC`jfDSFa8HmO9u#7J=rT&1ONcM2LJ$2O9KQH00;;O0M)r|N&o-=0F%%JHv(c- zlL!SI9N@6aWYa2mp4e3Q3U;Mg(@L3Q3VzD1Uub-B%k`5dYmx$ZnRe z5DIOeA5kg|0kQmZ4;Uu$p1)&Ng)IA&JFvLxdXh`q zBYoAAt4+tDsIbfH!hpeWv*t<1cCG4e-LhRNe3v^`&Q%oxyAtRy8Ln2Ii%M;s`?QH7 zazQ5%!=2Pc43_}i>_Z>=P4r?wWg`O0q8Ui5=I}kwwSU&t8GRiwa<(?xp0#W{BIh=m zl5z-M*AZukJhWX~K4KWTj14Ms1tTVgG0G51wb$273?acVe4Mu{=QzVuCsnuWGH(0O zgBvQ{O$I|g_r32|8=?1Wb?Q39Xlm;+hRDzToxnhbAu2^6Gu6Oz4a}*tMNDXzXSmjxh>aHw zvB(3tv{w-gH9$JvVR-CPa~Z>a=+@ z@UDrwsz>7&2H`YH$NSyqei2AP9aH3aO-UngLVxc%9qyRgK74>jQ9Q(lXIg$HK*s`u z-cSa|JvT?4HmkW=#1j)AVM!G$R~c^P{|72T8oq>W)!z=21tIx1mz-=`eK$lm0sY>! za!UgPt0_ez({`4jc=YnRdGylMVp>}a(K}#jhDK5u3~eky%9u9C=KEsWm=O=hwYl(I z=zsN(5iQm;HV})DPoIy(43gp3KSiP{HFcJ1^|s;9s^$|D>i)^pNDD7|+d_?>SK-bk z_ibKw#D@CNpyh2>tTyXq;dd zg_%XK=~smMwJ=<1FP?~Ub7yH!3c8FuYJXUwlWOxq8DwdC!-`On2{q0L;d5I3KvMCW zO2?xI7>p0)4>4Ry@8fFW5JRPXjLjV3`YYTj{fWo{-u#(jL->NeNs@7lVgk1*XB4;a z7AA>9$^`>=NS5dwpr{CR@<%D!#Fu0n0sDsnLOP~&OzU(dF`d9|kt;$8bdq1utADf3 zB7qsqQVoUIr9h43WIApsyx9Z1P0;!eakmt|w~zP!IKurre#PVIS6Ke#1nns8x~g>iuVgLH;i3nKw3DNtQNLioBx;3mEyxmGMJtec$~F;`l{Y^ICJV{O@- zPG*zG{)_)>W;$@6aWYa2mp4e z3Q3dm1Ums?lQ0Dw1;5sZ0wR-91rr2zsR~JxXazzIcBu+U{cZfiE(8DoUz4{5IUsha w3Q51#hXNu1001Wd001HY000000000000000z66s21tgO+1`q}?1poj50C1E$WdHyG