From 5b98b1b9bd34ccd2afa449bc9f7c3c0d64b71b35 Mon Sep 17 00:00:00 2001 From: Michael Pardo Date: Mon, 29 Aug 2016 15:58:14 -0400 Subject: [PATCH] Bump support lib version. --- android/build.gradle | 2 +- .../news/ui/item/detail/ItemDetailView.kt | 2 +- .../clean/news/ui/item/url/ItemUrlView.kt | 2 +- build.gradle | 174 +++++++++--------- data/build.gradle | 5 - gradle/wrapper/gradle-wrapper.jar | Bin 53639 -> 52818 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 51 ++--- gradlew.bat | 12 +- 9 files changed, 127 insertions(+), 125 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 249f647..2c52c2b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,7 +34,7 @@ dependencies { provided javaxAnnotation - compile androidSupport + compile androidSupportCoreUi compile androidSupportAppCompat compile androidSupportDesign compile androidSupportRecyclerView diff --git a/android/src/main/kotlin/clean/news/ui/item/detail/ItemDetailView.kt b/android/src/main/kotlin/clean/news/ui/item/detail/ItemDetailView.kt index ade373f..b04591e 100644 --- a/android/src/main/kotlin/clean/news/ui/item/detail/ItemDetailView.kt +++ b/android/src/main/kotlin/clean/news/ui/item/detail/ItemDetailView.kt @@ -47,7 +47,7 @@ class ItemDetailView : RelativeLayout { override fun onFinishInflate() { super.onFinishInflate() - toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha) + toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material) toolbar.inflateMenu(R.menu.item_detail_view) commentRecyclerView.layoutManager = LinearLayoutManager(context) commentRecyclerView.adapter = adapter diff --git a/android/src/main/kotlin/clean/news/ui/item/url/ItemUrlView.kt b/android/src/main/kotlin/clean/news/ui/item/url/ItemUrlView.kt index df6b7a7..b946dc7 100644 --- a/android/src/main/kotlin/clean/news/ui/item/url/ItemUrlView.kt +++ b/android/src/main/kotlin/clean/news/ui/item/url/ItemUrlView.kt @@ -45,7 +45,7 @@ class ItemUrlView : RelativeLayout { override fun onFinishInflate() { super.onFinishInflate() - toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha) + toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material) toolbar.inflateMenu(R.menu.item_url_view) webView.setWebChromeClient(LoadingWebChromeClient(progressBar)) diff --git a/build.gradle b/build.gradle index b01bbe8..49e5d2e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,103 +1,107 @@ buildscript { - ext.kotlinVersion = '1.0.3' + + ext { + ////////////////////////////////////////////////// + // VERSIONS + + // Android + + androidBuildToolsVersion = '23.0.3' + androidCompileSdkVersion = 23 + androidMinSdkVersion = 16 + androidTargetSdkVersion = 23 + + // Desktop + + // Libraries + + androidSupportVersion = '24.2.0' + daggerVersion = '2.0.2' + flowVersion = '1.0.0-alpha' + javaxAnnotationVersion = '10.0-b28' + javaxInjectVersion = '1' + kotlinVersion = '1.0.3' + kotterKnifeVersion = '0.1.0-SNAPSHOT' + mortarVersion = '0.20' + okHttpVersion = '3.2.0' + paperParcelVersion = '1.0.0-beta8' + phraseVersion = '1.1.0' + reduxKotlinVersion = '1.0.0' + retrofitVersion = '2.0.0' + rxAndroidVersion = '1.1.0' + rxBindingVersion = '0.4.0' + rxJavaVersion = '1.1.1' + + // Testing + + assertJVersion = '1.7.1' + jUnitVersion = '4.12' + mockitoVersion = '1.10.5' + + ////////////////////////////////////////////////// + // DEPENDENCIES + + // Android + + androidSupportCoreUi = "com.android.support:support-core-ui:$androidSupportVersion" + androidSupportAnnotations = "com.android.support:support-annotations:$androidSupportVersion" + androidSupportAppCompat = "com.android.support:appcompat-v7:$androidSupportVersion" + androidSupportDesign = "com.android.support:design:$androidSupportVersion" + androidSupportRecyclerView = "com.android.support:recyclerview-v7:$androidSupportVersion" + + // Desktop + + // Third-party + dagger = "com.google.dagger:dagger:$daggerVersion" + daggerCompiler = "com.google.dagger:dagger-compiler:$daggerVersion" + flow = "com.squareup.flow:flow:$flowVersion" + javaxAnnotation = "org.glassfish:javax.annotation:$javaxAnnotationVersion" + javaxInject = "javax.inject:javax.inject:$javaxInjectVersion" + kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + kotterKnife = "com.jakewharton:kotterknife:$kotterKnifeVersion" + mortar = "com.squareup.mortar:mortar:$mortarVersion" + okHttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$okHttpVersion" + paperParcel = "com.github.grandstaish.paperparcel:paperparcel-kotlin:$paperParcelVersion" + paperParcelCompiler = "com.github.grandstaish.paperparcel:compiler:$paperParcelVersion" + phrase = "com.squareup.phrase:phrase:$phraseVersion" + reduxKotlin = "com.github.pardom:redux-kotlin:$reduxKotlinVersion" + reduxObservableKotlin = "com.github.pardom:redux-observable-kotlin:-SNAPSHOT" + reduxRxJavaKotlin = "com.github.pardom:redux-rxjava-kotlin:-SNAPSHOT" + retrofit = "com.squareup.retrofit2:retrofit:$retrofitVersion" + retrofitAdapterRxJava = "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion" + retrofitConverterMoshi = "com.squareup.retrofit2:converter-moshi:$retrofitVersion" + rxAndroid = "io.reactivex:rxandroid:$rxAndroidVersion" + rxBinding = "com.jakewharton.rxbinding:rxbinding-kotlin:$rxBindingVersion" + rxBindingDesign = "com.jakewharton.rxbinding:rxbinding-design-kotlin:$rxBindingVersion" + rxBindingSupportV4 = "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxBindingVersion" + rxBindingAppCompatV7 = "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxBindingVersion" + rxJava = "io.reactivex:rxjava:$rxJavaVersion" + + // Testing + + assertJ = "org.assertj:assertj-core:$assertJVersion" + jUnit = "junit:junit:$jUnitVersion" + mockito = "org.mockito:mockito-core:$mockitoVersion" + } + repositories { jcenter() maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } + dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.2.0-beta3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } + } allprojects { + repositories { jcenter() maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url 'https://jitpack.io' } } -} -ext { - ////////////////////////////////////////////////// - // VERSIONS - - // Android - - androidBuildToolsVersion = '23.0.3' - androidCompileSdkVersion = 23 - androidMinSdkVersion = 16 - androidTargetSdkVersion = 23 - - // Desktop - - // Libraries - - androidSupportVersion = '23.2.1' - daggerVersion = '2.0.2' - flowVersion = '1.0.0-alpha' - javaxAnnotationVersion = '10.0-b28' - javaxInjectVersion = '1' - kotlinVersion = '1.0.1' - kotterKnifeVersion = '0.1.0-SNAPSHOT' - mortarVersion = '0.20' - okHttpVersion = '3.2.0' - paperParcelVersion = '1.0.0-beta8' - phraseVersion = '1.1.0' - reduxKotlinVersion = '1.0.0' - retrofitVersion = '2.0.0' - rxAndroidVersion = '1.1.0' - rxBindingVersion = '0.4.0' - rxJavaVersion = '1.1.1' - - // Testing - - assertJVersion = '1.7.1' - jUnitVersion = '4.12' - mockitoVersion = '1.10.5' - - ////////////////////////////////////////////////// - // DEPENDENCIES - - // Android - - androidSupport = "com.android.support:support-v4:$androidSupportVersion" - androidSupportAnnotations = "com.android.support:support-annotations:$androidSupportVersion" - androidSupportAppCompat = "com.android.support:appcompat-v7:$androidSupportVersion" - androidSupportDesign = "com.android.support:design:$androidSupportVersion" - androidSupportRecyclerView = "com.android.support:recyclerview-v7:$androidSupportVersion" - - // Desktop - - // Third-party - dagger = "com.google.dagger:dagger:$daggerVersion" - daggerCompiler = "com.google.dagger:dagger-compiler:$daggerVersion" - flow = "com.squareup.flow:flow:$flowVersion" - javaxAnnotation = "org.glassfish:javax.annotation:$javaxAnnotationVersion" - javaxInject = "javax.inject:javax.inject:$javaxInjectVersion" - kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - kotterKnife = "com.jakewharton:kotterknife:$kotterKnifeVersion" - mortar = "com.squareup.mortar:mortar:$mortarVersion" - okHttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$okHttpVersion" - paperParcel = "com.github.grandstaish.paperparcel:paperparcel-kotlin:$paperParcelVersion" - paperParcelCompiler = "com.github.grandstaish.paperparcel:compiler:$paperParcelVersion" - phrase = "com.squareup.phrase:phrase:$phraseVersion" - reduxKotlin = "com.github.pardom:redux-kotlin:$reduxKotlinVersion" - reduxObservableKotlin = "com.github.pardom:redux-observable-kotlin:-SNAPSHOT" - reduxRxJavaKotlin = "com.github.pardom:redux-rxjava-kotlin:-SNAPSHOT" - retrofit = "com.squareup.retrofit2:retrofit:$retrofitVersion" - retrofitAdapterRxJava = "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion" - retrofitConverterMoshi = "com.squareup.retrofit2:converter-moshi:$retrofitVersion" - rxAndroid = "io.reactivex:rxandroid:$rxAndroidVersion" - rxBinding = "com.jakewharton.rxbinding:rxbinding-kotlin:$rxBindingVersion" - rxBindingDesign = "com.jakewharton.rxbinding:rxbinding-design-kotlin:$rxBindingVersion" - rxBindingSupportV4 = "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxBindingVersion" - rxBindingAppCompatV7 = "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxBindingVersion" - rxJava = "io.reactivex:rxjava:$rxJavaVersion" - - // Testing - - assertJ = "org.assertj:assertj-core:$assertJVersion" - jUnit = "junit:junit:$jUnitVersion" - mockito = "org.mockito:mockito-core:$mockitoVersion" } diff --git a/data/build.gradle b/data/build.gradle index 3615eb5..ec041cf 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -21,11 +21,6 @@ android { disable 'InvalidPackage' abortOnError false } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c6137b87896c8f70315ae454e00a969ef5f6019..deedc7fa5e6310eac3148a7dd0b1f069b07364cb 100644 GIT binary patch delta 11871 zcmZX41yof**Y>4B=?0PRPHB*kZUI5MyX%ryLb@;A(v83+C8WEhJ4BEaL>m4p_`UDP z|DCn&nzQzKo@e&Vp4s=DnF+~*o6LYiSCNN`BLj%MFl6J-K=zY;x64g|DdkrORg}YJj-jR! zrP`NIYjz+6muK6)mYw+os{E`n)$~1zWa`Yaz;di1U=bFRR^mp|(pDjXjmT2(7qu3; zo@?wYF{;Bg352u&H~;#%_qLv1ccUAVos>Pl6}IrBT+$bOSrR6PCF!^4f>V*7b1Q0_ z_f9BSypcC^^S?sr;?A&vt^E2m{Db%4LQb9MDEk@6(%nX{A-V1>fi+OuiKQ-gJ~)FQ z%AU^36h8O|vmln-+=7%GhTYwP~^qBe)AV&2M+{_{iw< zZL~fSQ5A$BJ)0^w$rnF;pSIT$JYcf3ko2J)^##Y2cF`K80(|WhWf$kJ z%kq>5h)AXuXP#x*b&&tP*6O!SbXB+BH~!J_w^Y&gHqkU-(L|9!ZF@xt&jr}1H{GnY zNeY^zUCFHcXS>+v950M^={LQ3Z^?e-eTShdjnK7g>ivMmL1kpEG-DpQYvJO%k>ecuQ+qBC|<_P#=y;f}o9e{;6!P7oAONJ2WRJKo5^>69+GQg9|Tv(?6W;xFDcP z-3Juq0FS7=q6W*7n5^}hr69`A9=D2V@#fW@iYJWe-jK_)41V{-KZ%mS4F)EvzyVhU zV`p5TV{N5{nfm>7pS!dDyOhKJ&Eyqe z+E$mAd2E$p_3nIx*>QYdPQ?Oa4t1S^`YOl>xgnKo@U5tq*?UGD3(;R@^_jz^>(rOQ z)0D||Wy-te;;>qS$kzg3y)oQb4@62HZD*RTFxFd)Yw1*;#8yPzQ5$l{g5DDxgzi(m zF*42%$q`;;ea|zdJI1PFG2p(_ycZ`ykRDqT=|1w55jFE&*^&OB#sXmfAQp{A*vSr3 z)n#rAOqW?}koZ<{(8a@>5_l~Q3??P(l#sZ+p-AA7`Xd!0?QFR=+koV@#Ddp;JwWP} z7oswYJ|X$Lq<)*^Jz*|SNPV0yM3iXs(pm~1BPw0h8aJeHL8;0b>FM7oh?8H4ug+ca4 z@Vhq934LU%IuZ41z<^A9?}tSw1fD-y^#vV^5q51j)*M8HJP(8D4C&735}|7CUF5c` zt}#T!6&r7h)#x{-N9uxvE6%*Mmt9ME@-ZjFv|}KX^e#;uB--ishJ|j24f97jvQ?K^ zc6oMHW~B~~#DzK^7=xleQu^Mf22ayrtss8PV;VEQuwvRl1OSN90RUQP8Y2K_c4LDQ zH7^Zb%wpZM%DmSuw_`RDG?Xz@z@dOCUGBA0+(=@o$A(W}>QNHMhv4spCf0nZ`Si}K zN%4qDc(VE27d#WUG_HK=eP3L^Ib*w59^42AGt0R zDUndwr}9-QGM=FejVSA#YQlk{wiY8uj-%VKUr9TkAosJGyRpjpp!=KPbVmCgM-m+l z+ab`8<7#>l(k{B=0YZ_F1aGb&;bZ+b^Mp#9E}TC4J$85op&Jn#)W>SL2H4-(hK}(# zerv?F;rGm%-AUoDMsDbE_`F!f`oSjsYni@{j?O^ymoJ{Eilc2aq>_M6v9E3fR2OcO z#EkHMrUunJw^%TGou1Fl)6dq~%i7J#$lC90(AM7C&B#ea&_!F!=PKCm?HI0GS*&&r zOc{IW+Ogz-v+lBU@|kguileE$-=DCOu%4?DDg>P|f+(84&s7Pp-gNPrByq;1zX_zJ zj7dw{)mIzOBGJ{vOr!r^;_kWt0Y#<`Zl@Ws{j_-_ar6AbZ26VhOWWWjG;r~Ck-R&_ z=9j^xnltD5&s;9eUpRV;UzJ!*O;m6B&2Ai6b~v7&R;SsT?J~jI&9!1-Bv+FXEG-ZrAK;WDNvokk8bX&7-tSAf=xY6HMGryn;x+GCm(60O zy2WCh6T&kSq3XV$-)5Rs(J#XIvYyk{Ef1*Ph2*5#!$eGbEP*zA3<)k`FQbUC(%))L;<-Wg;1)v4eAi6W1MFemM$_qv zdGmwrf`Mqj@*=fd>X!>zJLYb3W8T`0V3lL_FDAV98TLT!m7hynRE!|My!D2Q%)lN09K4S+7Ywf5%C%4sDPZS2>Qs4ssKyrj$inxn&VS*nN?bqO;-DtwH~?Z z4BI%G1B$kv*>MUrDjQMSxuv@Qltrd=t{!`!dHhNXE|v6ox8(MU_ca>NlF3QnXm7+j zBd!+%>Gk0tOQ0S$d$=BGCd>5BIG`YrJyWvBYlU%{GNoHbRVF*i(0taOaIXamqkUv( zplhIG+gfPl+jMU$@t$0L`A_rj{8jN(8-s&Pgnl|60`v^KD)v?sje!>F#P-i6hVC+r zVoo>^pObZI4QaNtS2Ub_Zs@S_E>U&7y8lhoPG{PBZkwq!`jX@l*hDyMC`sS<)z@M~rtg%UNKVJa!$a!$`Pf*k_3p2Zb z@oGV7J{ho_gCO0Hd>HwmpIgImcrr4qBsT)d{&XC1(;SoFc&v0Ko!EV=Mg#KUDyN;q z7q7!?3EA46AR??B9cN^agk?8}AUV6v33Ew02!G*g#iq<%A-)noDg`>yHAHmF-Jo(! z-v?V zxWZ!g-dWtD!H5-+w_|9ibiJ{~gNr#^5#wtG+aFbIETidf=yNM`zMX<(P;J&`-3Ni{ z4?jI8I}3&tId;m|LIn7n}CFhwR!tO%{$6?bI(*yud2*wC0HV zOjn`r6#@l2o4ekItic}CEMl$Q(pq%-6Q+mnuDw?*#jm*c&WOBxllZmF+;+Sx4@_U~ zQqKgSmV5s=9nMjIX&|Nf^2^};|N3HheATBT*T8vr)j#rjpL_&;)t`pG>a#q&>WlOc zgQ7IGJ*G4nPSs&N`^oO+%C%w=ootN|t1%+o93c0>bHjR+JyuNW0z~#6YyHmFOtZ`=wu|u?gu` z3+%`gdfwQy=;N8q<`JM`R!+r4K>)wm*Agi~FEfXU$(KizCQSF0AgbaSCfGb0Wk<;h zQHPaaHq}j0Z#E2DE>&B@K!YV})kbn+Wn2!{m|=>M`dL!il=g;yfxSH^lhX?K0VrNE znMQ+avfg@rI1O)&?N{E1yotJRdS`8E;~IIfGK)#(xaNA{=Ct_SnIi(fiZ%U(e%E2) zlYe1lOM4SuP^PN=x@f31|2?kn47Y8)8J%05x?HMtG#1CcHQ}(5u7T`yb)$1!uDcAZ z*Pf3c^XwSKGsjGVA^hu#u6hl##3){t?o8|fKy8wm^y1TVqK0Mr3zi^c9G z<}}?Uiu6# z>NQOT6LHzIxre-1jZ@qui$LdwwV|yYl&tlk7F^D|OLCH2Le5HgoR)iL_7t2Vn#3_o z7o?)c<9@j8ccR|WX%@Vnn?rBvJ$*mwzgFhfTt$kgjiS*lmo0ox{g#@4Tpj)h>o-A4 z<_hb4`P`gS)<<)+BE3{!jk*-EE{bh5q_L^zkc*&Vri(hXh>~wH-nAgJh!-b^w`lfy zj2La*`=;ql?6|&RUz9RO>pIx+?K0(905;<-+D`RRqwgb>_RVn2?jwNQBRrdJo-r%O zyI#EZRNRdvamE$Yr5;J=As;3R`KJ)e!I)l!8Dn&2+%ufE)UfU4Cn(EW!I=yzQwmg> zxz=wbVtf4E8QNrDpB94Nh%3Hc+^R(ze>r9sRW)gG$?ltdnT-LP?Fk_*&ogH?HH@73Ah8r<0%5EK^kNlcl5*0@gfofK@rV7n=~l;kIi$Qk6bgDhd{M}B{0>t_ z)L&ifbNDFHFO;p%S{+%R3Dp?q1UE6RCG@D5Gk=|ZqSF&QQXnS*VTNK4UeNBYcu+Cl zeY}&_J>o@02JXX;i2O2=Db_)9UfK!+jonFq2D!PI5<70i&l|H1^u`Z;P>ke{}?o))7OZF-e>~0q!P(nxy!Y`pQ zg4A2sDiP9dI^Z2OM)tFfDIrjB$Qa^r6S>G3qK|)1JG}`(TQ{x##&ojhSt5Dc;C6dI ztikiOJt0tg|Gov>MQ~&*Fl^q1lXWv4^@@e)oufvtP`H>bc-$wSmtW}HA`j=1ARoI3 z=QrLgLSlvAsAw^A$Y+^qW5q9tcm${8APT~QZYrIV_EhN&-^$%|M{v1OSnvRPnFFK* z;xt?n{651yx^FuaNcTuqn=Foi&iMwNKdV=|fzBYHV{sAjL{CWo*rhOTN$%Eice2zF3}UUe;Hxb4H{q<7W!zw5!w}pG_&hz^qee z)|Zb89qKI0{ga=1WxJ?_iy#SZlDt;j!`dics1nya#P|7&3ZA(}e)UfG*w(B@>xVPUuLEdHNh$>ME!_4#2eD{qdWKl~!`fQ@u71Xal15{c>i&B$28`l`l2S%whOVxZzD%pGW@;o|)et*#jq=D@*?ye$ z`!ojo{-U(ETNZgC=$zsW6f}?(*-t@bm25Qw)>4i zoAqAvWqft~f;pUnA~7x=5eYN2)8gBjF$H#k3#6BT6n*ePGe_i-bLs2M>ZQbF6h$uK9`w zkWlmZnSQ~Yt~;;MzrEOh!Y5mk3?~pPguoPdLe0!##Ek}H#slG^R|~b zV=Wl>s~f^<&$-t6dC9?&*%>_$Zl!pQUcYLM&ml-eQ9_LBIlq~!=AUs^CB;2t%$i$DECLaD^^+sXx(D? z))S!%@eYB@Zy-`CMnqO@|JAcp2r@2j(Xn<+N?LDZ=rrYpZJw&;0tz zRs-W5w3~B%&F9vpo|!vcX}0mT#;?eFTr~=imR$q}h;Asu+-P?g@R3atK3}VPb{E`^ zbc}&;-`!5_icV-0x3^x~%=6Mu3zS}WB%D2^c9maQ(B(BVm99f1&QLvL_tyE9P00`4 zPgcx4TVk_^Qe(3vxf>-%(^9~4oTg-gEv+|*3%S%{N9&Q+o(%wxDahNIFX`N#JnU-i z%m%mi<)P{#+RW2hXU&e{s=iV}8a&&rL1h$tXZS-4Uu;TE2bAnZp?31pr9P0?)vIx$S&ZA;#n+>zynE-=ACItkEWeENsli( z-k~BJxxARmo4LFc-L0uJ6!v4rg~5uaYLm+$e(@yar7zqduxSM3QLH)U+{C3Uoeh9{ zODwlH(8cj3@~HYXb81WVeF-4=19Slg0Yn;emKvB zRkN)kHq?*z)>#<#4tMUgz+AY-tE9Ze7;h(R2a06}nnCH)z-}_OU8Qj0(67Pbi$AJ2 zX}2sby|Dz9nGI))wGLU0mEF>QgC}9Q;|HD7$~_X2GzM@{O_~sQ% zWH3ekbS=Ly=4Ty!oMO-UH5Uq^;=!?PAkqk2P0> zIL{{&Jb3jA6W`u3+9$gp-Y>}b7ro~(;fxA?{RYa0=x(@)&OlOqJd0g4ON&5YEoC%I z(8Y()8CwP~6zf3dX~yP}Tfd^k$g4)6L)}s-pU^?LrH!mdS)LB1xAvXgJ;Kvv)P^v_ zy%Sta`8h4TuUeg3jbCYew?e6 z07u$%oGZ26!elB$(PPRr9+J4shq9}Xe&~ACI@x-D(f*~DSw7@fmFU{;%6Z$Z@6mNz zANbz$f&-A=jgKej*bqJf4Aa$TOipIt%gdDsh&Xmer~(~tCi=C=9qLzX@HF5FFH04?e7x8`G^&dbVk>I)H~3HI`yL=z*_01aE=K@U1#M z&swBAyfw;uuhp6Rv=J~$wV0ZgVnT3RR%0-Vi+hkXOxY>gX}_OPGzsnZC6L7wA8)EQ zffPFU@jx+~U5p|DF{KxTB9$9BK=BSbJRiB9S3)HlQx}nB*@@iQr<!Q=`ph7 zLk!|0vraaL;wRqST$Bb>$?6;?4b9#*O5FK%#W<8+;I~z*3HtfG!v-n$od1Grx>4zg zIX1x)?NG+MQRo5qv8vRTRn@hYZ5|tfq*vFMTS3b&L%h$?T>tz*hHsAErTguupd1-| zU17@2u|TOZV@|7@%&p9DtXvwF@T+{fJm(`=-x)1#n$K-R3emyR z;46^KFmkrS&&^FK&X%DSQb+e?FK)3sAE&!#%q4>AmNhJT%F*!#iG9@{embw@(IE`J zj4UQvA&MdrVj)vb6N2PQ$%(@!rp-)_V+yAhIHaF%l33Dr*>G?6FZ|5H$5 z$t(ny>@LuPSh8==r6d?(vb|HR{)e)P-gQ1Czs!;1Wl^Ne0%utJ%=7!Nw#>VKqTgbf zEMzeHno_SK!Iu3rmp1vMgsAD(%|~1{EKxNU^PTctx-L^^H=KW=={9uI1wsi$-WBav=NbaLnCekN?_R2sx*QLUH(sh7R~w2&15@1 z+Qq~2=tk^uM{a1MHLRJV^*M5tO?+gH2L&6fSv51RW=0a&+iOmcNnf zsN%UnY^ND@^3UDeEf&kRyA-X=30_@4C%*e2%6I_|7Tsi1C{2A{r=uL@wzo-q7v64l zA$a$R;-er>MlTnSR-=4}D9_FFdwi|!^)@B#WD^d3zL+leQ&URwpH$^AqXV*NW1yac z$%y;ZgLqw^Mmq62;zvs3~b(sS=NVga)gWKGBtUsK>{;g>sNvm6Z`! zwIu8fWlkugqIyJ6xK?f$adm=H`X;Dta+T|HGFeG$qA^Z5!5SW~S^}A%k+{f0LVCosUxT-M6iXnDd-D@=`Vy9~S&;Q?fpxlh zfz?r*iB$Jww_LTH9IBOZ9WDXtBCn^(WYb`+4@63Lc>GTa#S5CP+@QiTcny#YofLh+ zLRr3zafMb<*jcXT8s~|ljUv4fLAr|dQmAB%R8*V_w-f1|VtDbCq;RE)=O22uNZs^Q z+GSe|#p~|GS?VY|70Eo>SD{fY(E+wyX^rp=Ovd0AvW7{NA1t)-UbVIu)hV9N>`o>D zvpF8kR^=6C*~*(Nuk?J`&PhNR+lCW@deT4W!ls zq$!;kS1{3k`Pkc^^v+cIoqOAeQooYRfpuyY%95~ryjjgIzTu!Y(5kW)u{VBO_Oi3K6+Dzb zg`xv89sayZ+WQMan%9p1BVLdNQgBC(1^m7#unGJq&5rIl4n%OS1|e1WhU~-F^kz7o z;h}y%(|7$r^v!p4ydE-osw>Bo$i9WG4{4g@MvD3Nm)xDmrRZel55+XgHV{3-lpP z_={f?8~w|+$zS(j-6fF+U>V10WqfK>>m<$Y4yf#vW!~T3*h>|kIED{T_Z2fh9Q4nr z+EKj-AwZP73h{-h6Ahe1g%CNW!Y9ig`!lG=*3>l7Yf)PfAb@<)h~U#A=v1f6;qk;H zic}O6dWe_@a%lU(1tWJkpiSxk=i2fn(=KXOYt2CGF5DyxB>BS60XBx;sWlbJxj#;K ziQU7`D6DNTl+zTs5tV0Gdt<=r&Q6T%Sy{0xYs3(98zK-_#(U`@EwVw3PzI{-!Uk_PSslPuOmONJj~ zO{zPzj*NCgX8Z^5af~c$&z2){UtEy5b_Iz@-&zr*!Y89(-~jbZz#kmh$DkAanz#MZ z%cYBiq6*=rqJXYQMQ{nTIQ{i4_09@0!M7B+G$$E;JUGyT>PPfu(;~ZX*dciKx!9lE zqvxecPH6U@wR{^XQ>(FYy~`RIsvOPOXRN!0t!bng%AM{htHv8OguAyx~&Pqxs6(H`k5zCo~zOJ=$3vjt+Rf;7e&`8nllZKg~+y@ zK%R!(vET@#x=*M-H!d1hMtdCTQps6?(|A?RQWoFVv@~r>V+OblLc{hwFd5?bA>6hDbAhjM%!x^U=g&vqRX<_5kk zPfyDzy7M9maLrA%8WEdRbs5%%e92#{Vn$^g?ctQUu zE@?$<(Jack=k(a8^BvX|ENwNpIfL-AxS$ln((Xd*n3CRAHHAuiN1M0G0W}lvHP;SU zBwO-cL18O%A3{$NWu|bSimGL0@M2)OQ;+rBj`jS60X5c&h(^JXT{Omia9!=t8LPz_ zd#~pn?&CkD&(qSt;?Dn)$Q1hFQ!j)lMg0Ged0t+7X>#zjvJ6d&ts8*4-6P#n831zFNhKT*9ObACx$GgS*fur z6cYjfgAB<)p&aO4Wp#!0-a>$10+;JJO*l2a$nHYr-qEfPSx$-j2b%0 z&7RNsK1fK3Ber}E3$v*x5RFgfMi&Ecu5u&p^~Tb}X4Yg-6-45GoKKz1im*Lsb`?{+-|{@u}ePa-_p zZa-Z9V_XG%LwdALhL8WV6-Jgm*7&giLSTUn0Q53~IlRfigeCo&>G!;)$Y{3 z{)c039Q$XxZ+iO=r`Zw@hyAxYjQg&4xX|c9{Q{5yz$z0I)J*h)V{(eD4E5g`8Aq4~ zh864nh8zYK7w*3Y_P|bGxt^Zb16P0Lc^Ez5pI?ayQ=oDV&KA(n{FnE4K!Hg*hy_~y zJ+yE(GPO1PKN#p!0JH-hF6d(PzY7y^EA|6AUMb1`>R1Mtn&&~EOhbQE{{w-R5PxED zbqD7Irf22j3@%j25xV6k`2=$Z#gKsoVd=rLov7r0^?vMYxs*aNi_jnC6Rayd*r@{# z9Nzij0SI5>wX6#jRfUSOJOSz>JOGb+5W#Dm=BJ`p^}d=O;9dI?7FMtuwfX*V(KEZ&1% zxts7o;K?zeCj!=lP#`|^)DY<-xgAPQB6}bocN0C3pX{GLAs=x*07ZIeAAnEy68?*X z_%rbR+gTuf0RHF0n-Kc({a+k3j67lwibp+E55WIswEsUoWD5U$L;@@I;y!?%q_`)l z_i9k^-$wq;c+` quKDK>_>s;)AQ+p@X0IJr0QfWIibW=>Rj*1M~KAkpG=L|4n@W z0JH`Fxgh>u^}wNhv=5-aR%losE{uOA0PuG>TkC^I`(8dwX7EuTF>IKn#m*2DOQT zkA_hn$U9VMC(_W=FAo*qctXCjfC5Rt{5Aw&?V(4oD1qgD9}+aJL#N>1Bf0-`LHrY} z9%>>Oq<>H)vB9q%fhsOSUE=*86tsl+*E>Oh4B$Ig%>THsWjsx{4h7pol|`R`=Ug9D ziGifx_J1x=dJVjfhfbeVH0YVOCt!Ram}7|hq52G4-LWEQqYD52pFIKX`#w}(IrOiK z$A*YucR}FHa!N4TF!lpELX5}O2TFbpB?~+ucZ7h~!iB&h{iu)K88J)@n;7=s;@~jH zqwOAQlZb@cD8a%bkAemmB9nR0_Ax-)_jJY|W<8MEbFrEKcT)U6DgTKV8=t^11w8+U z0HobeH-si2;^zQ>;1fbmK6D7lKDy^ON(}2)0&Oqre}Y>7^|MO~)V)$@teyrnsQjU` zUXD>dbPOH53@Q<{V=Vr*6YHbPr@OKrr=huiik( z{7=X)>cHgV(vL)&abnoR`o~Ub#`+udNBa=e{-){Co{Ip+n4owNefmfBUsZ_zVhi+d Mivy9l^{?^&0fvnW{r~^~ delta 12771 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 KHT?K{@c#h9#jE20 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1b5714..fdf441f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 17 10:00:08 EDT 2016 +#Sun Aug 28 20:57:24 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.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 72d362d..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 @@ -49,7 +49,6 @@ goto fail @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