From 9def77084dbd10423abfbb3f40a3b2737c6e59b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Tue, 17 Apr 2018 15:49:31 +0200 Subject: [PATCH 01/10] This changes make it runnable in latest android studio and gradle version. At least work on my machine. --- app/build.gradle | 9 ++++--- app/src/main/AndroidManifest.xml | 2 +- build.gradle | 12 +++++++-- gradle/wrapper/gradle-wrapper.properties | 4 +-- library/build.gradle | 23 +++++++++++------- .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10486 -> 3418 bytes 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1ec2609..27729c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.yalantis.beamazingtoday" minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -20,7 +20,8 @@ android { } dependencies { +// classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1' compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:appcompat-v7:26.0.2' compile project(':library') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5e05c0e..6acf087 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ diff --git a/build.gradle b/build.gradle index bdd03e7..bf09229 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,25 @@ buildscript { repositories { jcenter() + maven { + url "https://maven.google.com" + } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' - classpath 'com.jakewharton:butterknife-gradle-plugin:8.2.1' +// classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.2.1' +// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c3ab459..7439821 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 22 08:24:47 EEST 2016 +#Tue Apr 17 14:05:29 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 57bfd32..9222547 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.library' -apply plugin: 'android-apt' +//apply plugin: 'android-apt' apply plugin: 'com.jakewharton.butterknife' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -22,9 +22,12 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:recyclerview-v7:23.4.0' - compile 'com.android.support:design:23.4.0' +// implementation 'com.android.support:appcompat-v7:26.0.2' +// implementation 'com.android.support:recyclerview-v7:26.0.2' +// implementation 'com.android.support:design:26.0.2' + compile 'com.android.support:appcompat-v7:26.0.2' + compile 'com.android.support:recyclerview-v7:26.0.2' + compile 'com.android.support:design:26.0.2' //RX compile('io.reactivex:rxandroid:1.1.0') { @@ -32,6 +35,8 @@ dependencies { } compile 'io.reactivex:rxjava:1.1.0' compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' - compile 'com.jakewharton:butterknife:8.2.1' - apt 'com.jakewharton:butterknife-compiler:8.2.1' +// compile 'com.jakewharton:butterknife:8.2.1' +// annotationProcessor 'com.jakewharton:butterknife-compiler:8.2.1' + implementation 'com.jakewharton:butterknife:8.8.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' } diff --git a/library/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/library/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e138434630332d88b1680f33c4b24c70ab3..cde69bcccec65160d92116f20ffce4fce0b5245c 100644 GIT binary patch delta 3285 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 T&6@dA00000NkvXXu0mjf1Mn)T delta 10408 zcmZu%WmJ_xw|>td4&A9pNryB@A5x^dO94p<>3k2RfYRM9-7NwlAl*ocG)N0d9S)r9 zckf;I*Znawd)BNq&zjk@);xRfXZgXU4pX$Y<}*UP2Y3Jg5I$E?)crSp`A@^a{@3gN zaDgQ<*@5iW&lTnL{g#h|eSgpybfB-s##-BY_WdzFb0)~+D5}WILrIx+DKW#EF)27> zMwBWMSI^p2{xIX2V^OHUW6sGHQBh*pIINLusv7)}NtjUoz$H|BoR+0k7nRN57eN!l(I4A+q2q zrw`o(lAe~1k$OIAF(=3$5bp>Q-;jMh|c4y zwKdQ<5ak>}7SvsFs%6B}aVrgwrHrI_ogt2Z%kuGkv}kJM#X;RPO@Zlaa7uj#H* z=)|kS=FCb=1DMfk$eXE~gqlFxc#$Lqpi!6X@$ztZGI5sqyPRyyKXOJm=)#u!pq07S z{$J6k$ICvCJ6;W|ggel(KO!t0|B(C;G*Hr}0H)gEt6g264GIX3-8!$+l#GBVM*T1+ zxo06jA~)#&LxlG4hsKzx@2i6fbwDUQfdZcTZsk+=t-pZtPX%3VMYG0qtDrtk@;=NVQ6^Pi zbeny5zh6C(p^V`!nUF8vkN6GyW|BWd7@zO)w*TtHo|0*ay)-ZkiuV*waV?E1(ErRW_-sEnp9TGz(zpcUtTY|mr{*At!f>>Ei}L|L zHBpZ*E5x3vi?j--Q)Z+a-4E7TL<3qTu;&o{Lq@rZdUerk4fJt02%=fCTWf{7Lw@&j zpPEY$tMV0a$>D$rR#hEGMrC|(9{(JJFJ7wO$bEZ2UW72h&xxrT`|&27h<*>T+zsa6kv z%Ue!tky8wCWL0FFxdR`z2SHZTH$P2gel!=BzQkI$Mgl{x)e?B6d4w z%H*|e6|j@2$3{odqgAp??)5V5CGt$!(X>#~V&vs?ElmoxwwNX4XEl+)&C$rC8zimg;Z3Cx73q247u|FlJtlYd z?KK12oLRaOuO+DMuYYg+5Sz%C4Ola=DHDr}ncQJU6*k~xYWQ<<4V$Rwhw<1m>W~Vi z%2g1kvO2WkXS{yI$jBH0d-l{l0tTa}qlRet{Wixe2r`{esrv}qAGNRuc3v~<+FFI3 zn%`jkeW&>$KlEk#lt%EjMSdUEB(3){>#QjFYRbqZh$E6m=kqn%*AiVOIWJ9EK#X-> zbrNso>S%&f1TB9<%FzX)R@V*&|Z3ZE8UW<06s^)z?e;K29SpDCZ;E>H|gRh?lsXg z(h)=d-teCC?SXG7CW$iWp+ja$3^%}Rqdei)GtHm$ienQ?Q)2prW*8fFA0*{?OlRG5 zAfCkL+%j!bFpn&Rmi?IM&N~XvfBg&HhemB@5=%%(=tC>n_s7gxZC1-&9sV|2<#xM& zP5Q@c;0OB32k7)rpuZq(S2o2Z{2s^z$%1{G8PP&Q5 z8js=OmiP}&P6WN#{iu;oSTKb@l-1ng{|h^L;m4n2PV$dp`Q%kwJ*-S7`BbokR9*ho z7YP(!jJ%^ivHZyz`yWJv8 z?gg=aB5!M9X;xR8bvpGZjHyWwg*k)d7NKHmq z$x0*-T)Vg1*M5BXiZHGMBsLj3{d~4O_9jezJQei8V$GD+eJMLewBtZ(jy1JMwnH9; zd$GQaj1Ta+T>YDVYw3S}s?{xm`1&DxS+ab{484+nGjU<=xjZscTEf>tZ__ObPjn!oYVLm~jhyGs4%GSe zvt>5@EBM3vGQzXY(rYW!%GE4X@nBJ|p^1~1P`-6>-QayfdDI8ts1H9@$lNI6^8K&3 z86JVi9G%DPvHqvydtyXI;3C#GL@~|WW7~E`98EAFboIK!YgE=Z2xnmDdC}rI?19`V zM4#5cNaYd9!ecRRuO&B4)G4me0TsnFy@R|-(QcoO!Yg`=0p<$BxXu%?y>SQGf_-I~ zB$JG>OJ?ru>$bV!Fi9pFX#_2E5M8tid86Ztop)~Dch}$WL#{&EKz2JAut& zcKi>P4C>iwQxB@Q(z(F+PKLsq;X4vGf1#s;k5@3_*dgjZZSe=KzxLq$K{3aLW)#9A zI|Bdy&loHZV6^ZaOsbfD6@QHtYq!VJw3=|lb4OwbP||JaP&;CcD_RDD#}f>zK1*9> z|DjtFf2!xZn%Y3Ki-=$g-Gd2ytI7&-P-rd*YFta0<1s*5HYWLEEH!7MkbABR(Z4QP zb*q&v4j!=vb$MM|x55O+m-l|DR2LQk{>fT?bI(i@kKdy%##>fSWY&MD$#Qw#51iR0 zzPw;)wLtH6T2}q{<}uLn#>#s~iY!P2BTlSr$n`ZyX|sGN?2Li@R2SdO%y}V~Ht?g4 z=(QdO-nx2-nBcEoPbir@IZ`M$?M!x6SUcJC{uK_AaS`v637tvWO}FM}X`9}RWdB~& zOha`Jv@~=jhU}>}*JB%@+f>aFzrVXz-3tv}fz*GqR~6@IZbGeH-+G1xIIw}Q0621d zPt*kr27?!D^lQ~u7u4~ac$(DDerDBDKD1i;M7V2~>s)K^DqdDqlFF=^J02q@xlYiZj{@+`Gg`K!$}#}NeL2DyOAg8461I% zti+pWl4A^(4TKm)V-6rY(*|_(dnmuiDCX2XYwg)MGn@3^4%3p^*YORRPa&K8DqKE& zOxhiCnbhZOcO}V5V*rP@zWO_*|$J6@<@Y1*S~_;Utf3FHcHr}XA)vFN!w|^qUTn9@9W#5 zc1k5@fGDczShzzTE#1=1d=7vgMESoqH=JL4?b^xR_=am<#(%EuqvmVy6?i;C*jdRN z{}5B>KPY_)dykg8!M`A^UvttE#j_e)pq(9wJ~c9Fe532I5_l~>`$|2;XI$ts$Z#p^ zEUthPPI^<<;kh5WWj}xxO*lT|sd7FynnEtbp{+jU&~gsP{%ks{ey+EIZVcJ^2EW3T z(?u}nqhs>{?k3?){_BmudfGWw4*atR))QHi~{Wo)_?koRe(!3BfCGlJH)KP5lOx?Cuk6B$#}oBkntMQWTR8zI7x)ExL1YhgSjAYM9a zb85}e)LY*SXLYBFmzOtjG{k@ITzElfmHS3Iv}1+5q?a$dRHBtk$M(7w1N^+15=c_N zuwtkOiNWp?lkx$PrNZ-pbl(1~(e_oue$3!hHAvDbn}U}aQ{atJhB~V7?0ye$%C%tk zemlHkHo8ZBFexs>y^^$0#!7ji5zGW8RLhROSz^^Sto(pmy1heY|zYdy>}QUl0&Ago7;c77tkmWR3!V{pz7>x2{vh zTtCkHK4iRyY;JB=OgER?@+=_A!jV zPxDfVRLm~+Am zK^LZPVw1|wE;%P{wR55_$NrQIUR^-dl@+a^J3FZSg#sZjJ|N<~$gJ*=7e3$KO)sIh zQr}`PE$SupuGvM0IBrm>t1FT-$u;2Q_F45)+7ruHU+Gc}5vZ0G*~iR;~^49QC##T$v0UyhEzp^sEVe85`$Xn!sTk8h#iCy1-=AM-J1v&|xUWP{J` z8yE06cvYR|;|^6jj!!U&MdQ)YyL@@d6Uv$t{1VAAnX7+9k66;~$1JTlEw7LTmS}9_ zT9gfc+cD41ohcDXJIBAHg{jP5zjSXhQ9kL%rMZDvqZ0?W5?Wbn4`0atp^FlZorH-w zM!qn7LMfO!{glUNd){06>S+0UvQp$~fhx#>I5Wte<_@`yJuFdKLpADpPt$B=+uOLV znB*n9I%mZFyR*Nx%_~dcf)Rh?qQ^ZwR946)&%TKqz5BP~Rp#4{XH~hWXKN!woU3jq zb6%IOvk~}~O9Vf~2vJJSu$t#E5mZ+qsB7v+N3!#f-?!TLyh_^~%bPDRenrsbJ!sZ_ z5&wrU!w7m~KsVzfT9mUV9sP3zH>O|ZY$kca>?swJ^5xn_8(yC+t;>_&) z+%-tbdZa!wuDkZpru<{JHu?ij%>=_B{0n!*r3-$$>-69?(L7R^$2D!>YUo$d=ot0) zhDER;t>F7#y92jOqJHfs3xX=H@4&P1CfX7K*!MTV#y9umS$iqGqY)oFp0K>o);gO@ z+~bw>!Q)!Qzpen3-kD$KtpzmoznLF|LaF((4tTKoHUmTVe#FjlpCX?={>mEjQ9`XZ zs^4-QH~R)p(sqY{$e4eVO~0PHJOaNTLh_``?#zo!BTekLcl0L}=bLDF2NdLI5|(^h z6?eFmW1ow^v^uY7QBulWnsk`-Ea3w-0CVM>M8z4=~TITeEcnD8gU19iM&= z?F@ps*xH*ASNATIQs;VYgn?b!H2BxpJ(LI-Nv6lIsM8y}yK&J3+Z~EeGb^K-okAA^ z)!UchD4rTwgF~j4nxkfkB!=G8pJrzHMLE4kTZ2{zJeTy#$1iekg@Wh%zbRIEiLQ*i zv3!E6-}~P9XUQp1*?ahu_mo$2f=6V)?Uc`QKCGcB2_BD8feIt&&4*6}5 za_AlY_g|!c`W~Mpt9AEykCvY7f%(4WV{TAY(``I%hs5rWO=ZZ#@P_1w(E{J_j4NpM)xVS*gEX3bQ0tLU zWKW5yVUy$?CyVWrVNYF|U)?cETGYE{I@l=qJUtKe4S*?T^|rs=&)e)eUwXVachktX z~w~pL~V8nzQ@R@Nf0JhEZOzQ=AcZ@-FQwl zy35b;)(t}?Bz=ErzK_kTwAIGtP8cWW&MxqI1B}n5vy6GWt;!6Kwoh5uTL%5^YF=)M zWiY7N{Kie62QI0-p&VBo|DCvat@5O*BJ~rp{EG01#!pL}WL6l~w-qRV{G5|RLXW}5 zd9rG8@g{8I7{s0UNiX^)Xz^CU=WkCqXJ5|;Tn$eF=7#iI`hT8&p*G3AICb{9bVYCf zlOz3TKJoe5+UWc+cA5J}}OW#szogXl5~lcme@k zVI$>^I^yV8Q|UK9*h&jk?q5a;hj&*O(nA$PM8+aA37giOb-AMU1ktuD zi|Q_oc_3rU$N(7T_ZXyna!QzSG5MG|UiLa;|M5m&0D|EVKz(@pje%LODt*!41gjk2 z~TmF#hIJrDXKo8L223lf_xb?q%Ijxpdee1nVyBKkC+y0h$* zvb|~RvTVnKNr%f z!>;aO{`did>O*E2@ClB1MLbo1b{1}eYlK(%9Qm0*CaFhaG^Ur|p^uGq7vVwtCS7IS;F~2)-ha5IxH_@2Ru&mkT-d?PZobPOW}gh)gN;o=Kt)(-5V7IpE-sA_1#O4`>bm6R zO7yuusQtX^6kj9!0O_Y#Bu5W>yHaRUi$PMD_wbDk;{5XbTH}5ld3W-D{U;IwZXqp3 zL{KK583!pMmH65gQ^`NF*1wxRsu%D<^(&vD zip6xZRA!$>HtB)OFGc+2uO(xgyT~*~y>yB0=B1^q4Q6m@8^Mi3O5HPU`_KT{^a$HJ z0r58VcG-CKdWAwnTV%+X=`%g;^7lraZ)3{NOobBxiP6!Q& z71rqS6eecWKl=SKiGoh&AVSD7=w-Q~5$hWqMLHhth7V ztxM72P=`OWXmfL!;O;pomqc~?A+6QMadAd(UDlWP3`yX_3NC4QHx_gYx{p;#aTb91 zjadOHU5vnJ4?8W?$7cN*0E7>|4A?~^Z2D!z2V^^Z$H)i~#&vi!dEGg^E1qhw|JgjR zV#?TSVrFON?Ui7f`=DUklO!9{j(|eb+U)?SJO^CGlJ+x;Gi(+7arObr+zOPk{lJ{W!>w!TDCVA$2*j8#yt1Ipl&>5@mzzJIX`&Fl;gz#1ym;`D@y ze-iohzyn9_`*Sk#t@5O`$ko5l*7Pm1(lGx@Vamc7G6ayBQvE02ds>PJp%Gg%`+*?G zoUyVYu3wN;XrTT;u6lWdM~YRLkGw%2C{{-fV^u}7k=QZI?>!bk$cOl9CK=Tpn1)dt zfD!Pwd;Kn7j3GGsyVOIP2@Z_w;$ix_6R^=|9(`}>=GTTrhWDzx-$Z-Mu;IZ)djH5i z{6Hr#OGTbp9y%0jMz$eeh{y2nl@-7-o=IRh-v1a2kE+fuP3(&>A7HPHA7b5C|ken|u?h9!k_M!lQeeSfRn@oCdi5sHVPMRRK0yn0Ev z(ka5CU+A`0g{_R1_4QU~O2^RgixQxg`rD7m!mM3g^N>sHQ|Nxg+ZPh?%vst|`QY;< z2hYqCVi6Lh(eFjuj}`#D1`(k+i^q&mJJ?*_HSh%oc zxtc8wLA)l0znS$Q;#N$=gy1NN?!T0nBHe8x5m#|KPxYbv&Rh+9Y`crr8+_7NIYA)o zaUfn{j-#-60Zdf2JHZcPnoH?!3BXNZhs62`c``-vkpiA#gD~dg9djkuAn@*ophp~j z-_@MN=jN?+t@y&H*Xd>`9Lf=TUbWVXR}T zUi13%9wpau5622b=*Cb@bA(cVZD_uCfra_F=Ct_5WJ>4_g0SIqtK_Gi)j(CMB`S(Y9E zkQ4!5nYq8d#h-ZSx8)H{dr~%MNY%?we}Q$+8?fL`*=61>mVN zzG|MI&0VX5H|>2a@oe6m&(AW~F@BQq6Jkm-XXXy(%Nrq$_Y!n~F9n!B+mpq9MrCFT zU!M!)@Pvq;#FI-gSg&ae6B7tv0Tir^K;zO^--DC9uheY5cNql~hr~k$E38Ltqs7|- z&HURG0B{|3E|y)|8gBVmwdr2b{&>~=V#w)tl{cvRW+jNdhj>1}!TUuOzV)y==52K1sfqyHfA!x)5VQ-}NhiDJ4LuQ%fWw6&qn zXUVmRBic;QT9i2F*Ixb3X771lL;N<(pUTFUQMUdeCs1GnO-0@GvA3SYuDacufuhWqKG$0uv~b@K;PmfwVH22uSoKvd zmH+@1I25kuMSio`tqnKPnod(ni!ly%YY6i|HPU=I#nOd2q%Lh)5p?r^`0y779qvXu&c+YM&t2Djtw?Rp zF%%ZD-r!pTa2%Ee8>sJgTR3>%Dt7qyU$R>er>QfU0celeqk;bpdhxw|TdqzZt;*L{ z$9Fa(4L9X-*Ec2s#pQEL567Cs079!h-$~VvUR1~LGWLwd`YX-%6dA4sReGe@tx2;;}+!*Mz2uy-W?~UBvp2B8voqf($jbwnX>=T$kny{a)>wr&l*<= zm&2C3ZXg1cR>#}eMb-7&q-SLo9ugnEGcrN=o$UtF`b7J+`h6h4PU7zB6y?VlN}lN1 z&v#MjY2C&sD^%N{4I)1CL!M&v(dEFuoGE+OogF`F-ygov5!>zfnd+p1vC}TqA{U}S zW+znpue^rKXkVh=0mUMvBX*Y>eyz?;;FPh5~)1!w+s%RgnxuccIf+L16k za#rhQ3>VY2j>`FOkh$NJxH-cTp;T$xVhxwA_?A9fk%DUGPSXDI{b?xukA7FBlX*&V zkP+-EdN?*?4H)qIxb3#HNty@q560ZK6(=K|y8S!#;1I&IW5d8>^Zc(H83)F9NvL3k zj}n1_{S(ymOV=_K-2ysLs_^yCPyzzm#?$WW0WH=B^M(=9f8rH2npC(}NZIlCw`+9f z`RBJtYtvx9r02}PPnsmt>;#9P315Z?xt>AFck2k?m|())T}@pr(q(kLDrqb&Xl|!R zRlW{W|IcDi)tC9x1q=7luAid0If z-NrF>TTk<8m~>pZ^ST+1QHNN8K3&K0P*#=lMkGq9@XslSX#Am0JDE-D5bGL`?7&`r zN$WlG9mr?N@@g9bgaf*WT6PZF9WG#6%KU^>kdqW0;B&ji#_-ftxmnX;>v0LQ7^@-X z+}AFqlBm_VZL#aSIks9DM2*iBF{H(rKwq%fA>MI+^4eAfv0`>6cGt6 z2fbqwo<|#B{oOSnXxJnsLKOY!ce|I8K$Z$t_8e;h*xOHH@iE(nPMzhXumG z3#}z}(Ok{MV~ozEx~{8(vMMVuU{qO05j&uBR#NVf1Nnuk+{$+%iVOe)+_|2Eg7hU(9E9{uv!O-H-*3+jp*Ktl zQOjW-as~!a1JXIPPz#C+#mo?T^8jLhZWcvCF(4f}zwFHL@pm%fn+Wt+cQ4_ZY0O&r zvawBav5-uWg(_bmqCV_yLjG+zHj@G?&Wm>sBz4ICSFQK|X!QO^$QKrg#-OUGr>Jvu u=ubW(V8a*ZS&?{wb{h From fe18b67b2cc81f29b9893bd5a871b18cc76b927c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Tue, 17 Apr 2018 15:52:31 +0200 Subject: [PATCH 02/10] clean commented entry to gradle. no longer needed. --- app/build.gradle | 1 - build.gradle | 4 +--- library/build.gradle | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 27729c8..1b1c46d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,6 @@ android { } dependencies { -// classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1' compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.android.support:appcompat-v7:26.0.2' compile project(':library') diff --git a/build.gradle b/build.gradle index bf09229..0f5c322 100644 --- a/build.gradle +++ b/build.gradle @@ -7,12 +7,10 @@ buildscript { google() } dependencies { -// classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.jakewharton:butterknife-gradle-plugin:8.2.1' -// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' } } diff --git a/library/build.gradle b/library/build.gradle index 9222547..44c2c44 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -//apply plugin: 'android-apt' apply plugin: 'com.jakewharton.butterknife' android { @@ -22,9 +21,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) -// implementation 'com.android.support:appcompat-v7:26.0.2' -// implementation 'com.android.support:recyclerview-v7:26.0.2' -// implementation 'com.android.support:design:26.0.2' compile 'com.android.support:appcompat-v7:26.0.2' compile 'com.android.support:recyclerview-v7:26.0.2' compile 'com.android.support:design:26.0.2' @@ -35,8 +31,6 @@ dependencies { } compile 'io.reactivex:rxjava:1.1.0' compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' -// compile 'com.jakewharton:butterknife:8.2.1' -// annotationProcessor 'com.jakewharton:butterknife-compiler:8.2.1' implementation 'com.jakewharton:butterknife:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' } From 5e57bdc76984e6468643adae527f247ce8eed593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Tue, 17 Apr 2018 15:55:24 +0200 Subject: [PATCH 03/10] return icon to old place. --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6acf087..8d6c3cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ From d391359c8aab614613262382bf9d0e7a13142061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Thu, 19 Apr 2018 12:05:56 +0200 Subject: [PATCH 04/10] this second plugin version sims not necesery. I deleted extra gradle plugin that was in older version. --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0f5c322..0d27892 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'com.jakewharton:butterknife-gradle-plugin:8.2.1' classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' } } @@ -23,4 +22,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} From a0ce119d1f01af6fe3f763d66bf977a7337665d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Fri, 20 Apr 2018 12:33:51 +0200 Subject: [PATCH 05/10] new gradle version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7439821..609b851 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip From 5cd170b6b94035a92895fdecf706cf0377ecdaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Fri, 20 Apr 2018 12:37:41 +0200 Subject: [PATCH 06/10] new gradle version --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0d27892..742188a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' } @@ -17,6 +17,7 @@ allprojects { repositories { jcenter() google() + maven { url "https://jitpack.io" } } } From 35730b7ee74dd0377085b4228f9c703e1c0328cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Fri, 20 Apr 2018 12:51:16 +0200 Subject: [PATCH 07/10] for consistency same library --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 44c2c44..ab7756e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -31,6 +31,6 @@ dependencies { } compile 'io.reactivex:rxjava:1.1.0' compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' - implementation 'com.jakewharton:butterknife:8.8.1' + implementation 'com.jakewharton:butterknife:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' } From 0100dbc3fce5717dde4733c4703d0de3625dbfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Fri, 20 Apr 2018 13:07:21 +0200 Subject: [PATCH 08/10] new gradle commands for faster build --- app/build.gradle | 6 ++++-- library/build.gradle | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b1c46d..02d1331 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,8 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:26.0.2' - compile project(':library') + implementation 'com.android.support:appcompat-v7:26.0.2' + implementation project(':library') +// compile 'com.github.yalantis:todolist:v1.0.1' + } diff --git a/library/build.gradle b/library/build.gradle index ab7756e..c52baf7 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -21,16 +21,16 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.0.2' - compile 'com.android.support:recyclerview-v7:26.0.2' - compile 'com.android.support:design:26.0.2' + implementation 'com.android.support:appcompat-v7:26.0.2' + api 'com.android.support:recyclerview-v7:26.0.2' + api 'com.android.support:design:26.0.2' //RX - compile('io.reactivex:rxandroid:1.1.0') { + implementation('io.reactivex:rxandroid:1.1.0') { exclude module: 'rxjava' } - compile 'io.reactivex:rxjava:1.1.0' - compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' + implementation 'io.reactivex:rxjava:1.1.0' + implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0' implementation 'com.jakewharton:butterknife:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' } From c3bd5f55c7bc5eafe737f7b67800fdca79dd5988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Fri, 20 Apr 2018 13:36:15 +0200 Subject: [PATCH 09/10] faster build with use of latest build tool and correct new commands. --- app/build.gradle | 4 ++-- library/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02d1331..ace4b72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.yalantis.beamazingtoday" @@ -20,7 +20,7 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:26.0.2' implementation project(':library') // compile 'com.github.yalantis:todolist:v1.0.1' diff --git a/library/build.gradle b/library/build.gradle index c52baf7..da550ee 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.jakewharton.butterknife' android { compileSdkVersion 26 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 16 @@ -20,7 +20,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:26.0.2' api 'com.android.support:recyclerview-v7:26.0.2' api 'com.android.support:design:26.0.2' From 644e94537c2d71bfe1fecb70bb5f540fa6d85570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urbanek?= Date: Fri, 20 Apr 2018 15:04:52 +0200 Subject: [PATCH 10/10] faster build with use of latest build tool and correct new commands. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 609b851..f27e592 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip