From d0538c72f7206ed90de0e82473ef4bc232106ee0 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Mon, 1 Oct 2018 00:08:52 +0200 Subject: [PATCH] prepare for version 2.0 --- app/build.gradle | 10 ++++----- .../drawable-nodpi/ic_source_comiccovers.png | Bin 6424 -> 0 bytes build.gradle | 21 +++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/ic_source_comiccovers.png diff --git a/app/build.gradle b/app/build.gradle index 3030f4e..d24753c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,14 +14,14 @@ def secrets = buildProperties.secrets def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim() android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdkVersion versions.compileSdk defaultConfig { applicationId 'com.tasomaniac.muzei.comiccovers' - minSdkVersion 19 - targetSdkVersion rootProject.ext.compileSdkVersion - versionCode rootProject.ext.versionMajor * 10000 + rootProject.ext.versionMinor * 1000 + rootProject.ext.versionPatch * 100 + rootProject.ext.versionBuild - versionName "${rootProject.ext.versionMajor}.${rootProject.ext.versionMinor}" + ((rootProject.ext.versionPatch != 0) ? ".${rootProject.ext.versionPatch}" : "") + minSdkVersion versions.minSdk + targetSdkVersion versions.compileSdk + versionCode versions.versionCode + versionName versions.versionName buildConfigString "GIT_SHA", gitSha buildConfigString "COMIC_VINE_CONSUMER_KEY", secrets['comicvine_consumer_key'] diff --git a/app/src/main/res/drawable-nodpi/ic_source_comiccovers.png b/app/src/main/res/drawable-nodpi/ic_source_comiccovers.png deleted file mode 100644 index e32be3d1812fcc19cb58028b780c2b2c62977254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6424 zcmeI0={wW`_r|}>j4i`hMyQDyTMdekJ%bs9u@1?WYz-p&z6+BzS}=^5?4nJUsVrI2 zBC=$cRG2ZgB0ImHf8lxid+s;qzRtPMdGWcf^X9&7VP**B66FE_0D8#?YXtzT|12xO z0s2=uD)fcab6X^N7~Vh7ps4``lh6p+};TyY8)9$Nz zjm+T5Gz>H4v1)$toM@M~76FJu!wXXZx`k8z=UqTzWc<$1zK+SN6wyV!$%RLGm0pVy501)iGgw-X4voHsr z$tPbEW*bP|Z%IDk$|_;uy=jW+=Wu23G+I|_O}nfHj>;`cXS%OMw3 z{2%hD)#V&0W1vp%u~T2|=HE5;{5`MD;C=?Dx z{@rSkrjR8L| zZbG!MW(dik=o2l2CElW+L0lBzKah+wlj8G>4i9oNhYd~(wG9tsH)~|6F;t@)}PEJr(4rUKo-T&-OpkrqpTI1ctfkoQx$ov6WX>W6%B4F zYF;uV8CZ<)Y2qu`^SSo*a!VMlYMRjk6r^Z?g3ZCRp%)FBaJHI#ofzJ%tjdR3>tGBw zl`%Tz!MU7Lc|4xKIU+OGc}B<@0IQ7EIpo@Ev!?0qtO_F?H_klDzR3etAsI0**~koE zF|Q42wN9vGJ!^3rbKOx-j9rj*xeATh|H%hDrcTRVv`$!HzoES&$f7ZD*?Q6fcML1F zYpDV|^EI>%awPnBXeA^~zVLmJ65 z=kD#<&Pa6Lc-eji$a71bXrfC*2y}kF(0_%9u)M}GYYf1nK#8gcj=N&Zce)Du3gEt|KIT}D; ze=4agUBlR1-SwJNv)R6Y&8VWYnFrCYiCB%esL~ujyu*ML|$kpY2Nrt+92H@Q`*gHe9N z$#qIo@)SUeM{L2Go$r-WXWdKfACcaNtPp{*I`KE&?&;MnT&UP#El}KLD+rD~cDb#h z_l^EleFT>6F?0_XReZHJcrKJ_d%r9jzGj0C!i?vXc*-X-7o2ol6>e)-FIH=^N>;b9 zqa=z;*%JQF`RSJs&1s*Ij*cWizd8bnQu=LZ9U{%@JNcR7mz?<1d$@E2&f#jX;7u~6 z>*Di$A;|_ntbky=58vs4Gb+cB=Tpd*{%Z{?a`vk;JvZ`F0cwFXYI=co)1 zi;oVP34L^eQ^E zn~=MoH1tYRD`U+eQV)c+UDh3$cRih9x5#S0BHH%jYWk6plN*W2HFoHrPoc$R$>#Xfub4&t<%6SbNl|0u^BdwS2h8q+Q(Ro_f-k}pk#MMw z`134{?EbAK_VkLW^4I*;hxqhkcc@As>B#4+Qr>?zYEF!ws?e^J$?mVO=*u$-KtQXq zfAU%MOgCb}iab)U{kYKJ&07Gfxq3G0MfY~MGIt_1Jh5K{pk&SpnpZgG=n={5P{1AUXK#rsrCXJ4 zKjGTd*lKn_x>`jtsRHwk{jk4(ryJkAl?4uZ1_~!if(I%V9&3@RL=kacE!ml!#Qmjo zGb}h&#B4(qP73gU`?8K{$i8f56d%t+?4$(VNH_s_+xcumz%Z7BZg+_Zt{WF`{Rpq z5kVVjh^3XAT%{s!!)-8k8(L+HjMy_vT;x8yLm3PnvJuIH7FHQj+@bu0KYo*4b{RLo zrRHN@J@k{M_qqSFJigHSal>g`Y|bI$o8)3_&*{%8+2`ytJR{G7#6Nr9uz!Mx-h2Lf z+toG&gI|q%dMoFE2bO{BNRd4|!6tU(9=_0l`ynHvKn00QD?)wPAJW!qGa$aF^|tp` z(}ib1#I+SqJBj|{-zQX#VnFHkLnXK=<912b^j~xCS8W}?L#|8L)wKa@>3|4_c zr{EhSwR>l@i+lCuc9k+}?>xA&Wp>XnKK&643Sj`=SnG#Rw|0055_ z*0{y)?&N>W5&0wR+%elGj}@iOG!j^67hJsS<#9a?*RfKnraGctV=qQrIpe2Qlo1ia z=UscKh51>Vlm|%Y)v4&a;CBDxby*(_O(!ns>=$hbKMFNJixp*igJiKNGU6Q##<^!2 zQZ_%x`{wH|>uf9V@@>fG$;8*B&3Fn)WSqU(s`7I)CLf203+11ZYAxf0o{9;XWHXGb zo!^>k=8pQR?$yab*|$*SyG#2E`T=1 zyHf92@iP8yG53IQd~>SV#K_w#t`H^ZmIfWiXk*!+p%%MX?rGDL;4qsf3ZRO1+{kn= z%Q|J|l1AhyWJY9)qO2&}aggld9F&Q&4J&&@Ezg9#9hDWy!(V=jn|tOQ{M)>YA7s49 zICX3NRcHpN$kFJsjQ*k-!^rS`)2?_1PQKuQfC=B@zj^oO%`aE-(-^lc<|z(+#H^&G zL)8H%)o=lGrn#XMMYMC88In;F1W%Oe`EsSB_CAMrtJ&ZPOpSK`I}|TIwzstSxQyMA z_$$Mvw@XKLqv8N#0_fDDp~= zUYUFVm($C{?@|WmxowXaX4fSOF2)9tM3jVOC>)suuEbk2Tos2XNy{K-rye_g4JTF9&6ERC4EvYW8yiA+@ODuO? zEQeql1&65W%6PA)!1w@W885N%i>DD1`&CfGX4AnaJ+1TEM{$h^LGtHed}=S+UhDYO z6&dqA@R>tXRd&4~i4fR0HXS}-TF#&^mF%QtmDE;LIGw>Z7FlA4)CYpy(;RH!orFt< z-@tK@adwmgnn-@gZgY3ICxRt37~;ei!bxI|WmiB4raCBT7vxf9Xx>7O!Oyu-vO+__ zW$#1;Csz~C)$|O-+=}1`(H4I`Ye_cHGYouN5)Ce;DxoWf^aDkdl`-x!Udm3q)8wYf zw-9(3YdbMAzCtmi4tf4@uqYlrVAGLPcUz}yT4I2^d<8}NBx; zK%Qqv*l%EhO*hYkMsz)U-WDf>n{qCJ41V9qGZ>(9k<+V_dd2MpJ*9!uQ&{V@J6-eN zVFiI&_->>0Zz%_NQSz$t3B7kd5=FB%wwqRtOA&tQZkaG5_1wE|kk1<0`Nn`;)QZyb zoI+39>bYZ!_m*`ND=Jn+IVRCU!_niyHOpCK{f=ybt6yE` zu=_>q)Ne0Qa9D))^48iR&o7y8j_(9{j$Q_m^1o~dG)J7jggahF8(xPT>a}fU4S9HB zQgC&=d1}hU%q`P}w$agrLqBu;xE5*KQP6k4GJJ}k>}OcxIYnRK7+8#0o!kp&eAVyr z6vXdv43xu{58pZW>2w+2yP%L!;dcRRYCrVUP;C3v4&ohX&tXl|WY$$ZY>^!Vg{?1| zbjq(;(~id=M;1I096C`EDk}z@m=rD3PX6#$;TMy{N34;BvWl39v|+jt{y0h4(OCaP zxQK%ud*hRvg?AWLGi%Q%?gGM9Nk-plgApF;vC4>X>HLfO=;uUxq}E98YY|#gl{y6F zs|>w``(;k&t`_o7jef-T=~mC$@DvSNrKtk*vUfJ<1St$V_bKqac+AArm~2z7b_|`^ zhj0&@CK&PJ2SVKJ4D&~c^8w=wosN$>E_N8a11VV9tzCHU`VZlb`$it0XT|*X8*4|a zjb|V^Y`bS)hF8abdF|%hwe|ebCc6iNh5$&HQ@_@g?KO$%T`}ofc`%Kq6~AVPnnR8tkLjS3okhP~ua2 zNiJn>$pQ&1r!i?4H~xO(2k2Wp7G zy!W|sI1B)*CqQy1$U(-qE zz#==F8`);6taS7!qryGo_kT;@vGfQIA+kz00rzBv)a@H>kaDe5Pc#aKr@Jm`*ztW2=Qfv|G6#n4GhQeb2x$4Za&I)pKmp+WHNX%hNWp2TM%(xEHqD&_k*hNm>6 zeD2*-TAvTc>IN6v(&XDF?{-ZRcFJUWz<{Gx9saK4!$L*ht3sY)zw~M2YI>$omu~iR zv%MuQx6|jI!7qeag&+mBPkBDgJ*M>|*cyrA?_6jy3#x^{N1pbcxCG}OqL<8aGVg3$ z$sqeCqU~NU1^VwB)0+EYOTgF|9t@w2OgnX5Dp;{~ps@@}J;g5meZo=6ez03@*a%=` zd!t>*1~w+)CrsJzHWi^*s#F`>T*%hD*da+=gBufZW*=sbMfR)3X)~}TK(CHQ-s?qu4*+`OfCl@8Ou>F5F3u~AeuTW zb%rgz<}=4a0NX3J|9DaCz@FP~3+S87v-76FX9Gz*7h_o!v(Ap*-Ogf;h*Pm)k!l>@ zWWQvlsk$*(Onr(gaM0GPbJ6GuiSFn5<_R}-@rBW(-H@LHC(DTX@WBf{s3k2fOI{1h z`2)Ue-IF{M5v6~`8IYPo=7A*~%R^KRw6MZj6C*&ZMK zhy{*FM+Vx%;nS<5ufRD!s`8EC*!o8gi(xHUvEqTwxij^ty%7S7zF_RFZZ7qQK9!+q^Ksk=f8~<|Lt+~JUO@5u9+kJpBtBOX4rZ?m&E@ATu(O0 diff --git a/build.gradle b/build.gradle index 65f8feb..a7e239c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,17 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { ext.ci = 'true' == System.getenv('CI') + def versionMajor = 2 + def versionMinor = 0 + def versionBuild = 0 + + ext.versions = [ + compileSdk : 28, + minSdk : 19, + versionCode: versionMajor * 10000 + versionMinor * 100 + versionBuild, + versionName: "${versionMajor}.${versionMinor}", + ] + repositories { gradlePluginPortal() google() @@ -34,12 +43,4 @@ allprojects { ext { isTravis = "true".equals(System.getenv("TRAVIS")) - preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) - - versionMajor = 1 - versionMinor = 0 - versionPatch = 2 - versionBuild = 0 - - compileSdkVersion = 28 }