From 77eb7304f0f3ddf6da629834725f970724cdf5e8 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Fri, 16 Feb 2018 13:28:50 +0300 Subject: [PATCH] Upgraded android gradle plugin to 3.0.1 --- app/build.gradle | 10 +++++----- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 54727 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- library-image-loader/build.gradle | 8 ++++---- library-view/build.gradle | 4 ++-- library/build.gradle | 8 ++++---- sample-custom-extension/build.gradle | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bc2bca96..286e6bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,13 +27,13 @@ android { dependencies { - compile project(':library') - compile project(':library-image-loader') + implementation project(':library') + implementation project(':library-image-loader') - compile 'ru.noties:debug:3.0.0@jar' + implementation 'ru.noties:debug:3.0.0@jar' - compile OK_HTTP + implementation OK_HTTP - compile 'com.google.dagger:dagger:2.10' + implementation 'com.google.dagger:dagger:2.10' annotationProcessor 'com.google.dagger:dagger-compiler:2.10' } diff --git a/build.gradle b/build.gradle index 036e147b..ef441eaf 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } @@ -22,7 +22,7 @@ task clean(type: Delete) { } task wrapper(type: Wrapper) { - gradleVersion '4.3' + gradleVersion '4.5' distributionType 'all' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee94c0ab25cf079ac8ccdf87f41d455d42..27768f1bbac3ce2d055b20d521f12da78d331e8e 100644 GIT binary patch delta 1862 zcmYL}X*ApU7sd%es1cMBJ1wE5C~B>eseK4Wi`3Ru>;|>fGOwt)+?vCH7sL zps~ijmN9g(r5(Fb{4;sc|2^k>&T~Ka-shh4eQ_HIEd2zQ^qZ{q?_`xTbR5`rgZ>F( zW=eHf9)BrCEtxIHRXh-$ z`!s%Xy2Bs7jv6$V@GMU-&0F6~!j9}&?O_{EaaHe$?l~56{Dpc1z4m3=?~!ZzXJ`92 znXa!cz?vVn)9^$i+7=$o^vOx&4_m*%P7bx6&PsQek= zPHkJ2f1;YrUsmO(>3WeIPpceCDp4f1spXAfwn2@YB}P)HymCwb%uUw9=4!LRKKOOG z<}AlNaW}7{`m;p_1#g5VJKmqzflr4B~$+xm<^cG%>OgH)0H6=T-dNlt*xT~Xq zCwTzkpjssQ=Gq8Xq*)ixQ(fh6x!ELjSflFO>eVQG>dY*P#7z+0Z+KU9xYlyDJEvgk zy8aMX0_*L+odaFEU9amHtla61a=>~zXUg5>Xi(CEKBpELIX$bb19t`we8k1Qcod__ zLZ}=Z>(Mf;u@l?2su{4@U3oN6ICP#;+#+&!r@GvKRW# zV}=N)MwA`ml9fh)@%U!I4(2E*T+7RDt4hL-&oumc3KNpL03+0peP_d*>4 zJi{64GkZlszOt3DB2FWOKVQ*H@eY@efPeA#%}C}^k4i|JqvAJJO35@iM~s>aNqlSS z8|2nht(95v%H!74xLcpR_0~nUR>i_>5qvDyzTe;8D5aUFcph=O_#7Ga(ITzOHqxzz zmIddCq>Oce#gS)TgOUPF6~!la1`%y(&rVWc3YzAp zTfa*E^KD+66IxmXY+11RUBPsdBI@9rYC^u+y4B^^eUlBHRddya>}u7uc3h@2h<0|A zr>&xL$@SYFn@`>GpU__4s069?HU^km&ZDy_0K5~Dpfk@Z%aJytRE?91+g4Ds(-d_pD5l11a!*y7Q|YUV z5jGAxYbf>lTa>TvK9^zqAa!1O_e*j2?esNRMNpjD%AF+m& z^_n-Bj6D!iIqR4k1Wdc0fZ3DMDgrnVF*1JrZqoXO4y%q+qWe1$S>q}ZmFTP$%lWDd zs<;lDaQRc4)_#a%2!`0ljSLAYXqyRm7ZQ|3V14mwoXD5f*-?Uvh{4+82t}{+uy!Fj zwj>4hQ}JoQGI!=U(+!7|@zb{1BSasYoxRC7Jsgm#Z>-vxu)i#Yr_oTDcYovsN0mm&rT&eBehu{F z=NVh@T-eOL=4Q+Nm&zHH6(#J(-`=w6E)iOLJ8~|`03H7HNtaQs$59x>BQSL>uNS;1 z4fg(c$={IoY(o!m)ima@=GRxDRH8XD&|LODbt z(xBewb+MipperIQa=&YKk>}(9!KHuWm(%;+MfY{n7e#^gG3nN5{~*&eQ-l&+T_7Uv z=bkx5?TP5{UwKAz`(@7edPT~u)begQUv;+rj^$6yQpSsBfAG;b^nSS3oBddy`3b}+ zu#ls<0J5IYyo6rzv9VBm$kjW4I!zI1A>|LEz0A8{d~&+Jki+Sk4`3VMfEGu{tkD`@ z>qeThumVNHu=?hZP)klWCZst#2YTQv9=J)iVqEz8Wbyz94nx}K zTwv^A#X~PJ{Rjx2QPjZ;(zhvqRtp%mJcYb;KLwC>F(Vb7Fad>^0I?--05_okl4%5f znv@1C8`&6!2OUtZAAU?H0QaN=h`9&g?9l~qLr|b$62?3Qj839K6(pdJBn8+{K}G)i aJ%0KSFZ~Jqf0(Y0f%vJbY&PWo;Qs(ksB^sl delta 1775 zcmVbznQ*=)eqSh4iL) z%q4IG^9kIZyW|G$FlzBc!5uEXJV6a7QTLjlmGAC2`gi z4@*W##(NTEtK{gGS(eZ>en-8l<|>YEt?>PK%Lk~Hwe0DTb0tR?kq|;+z8sTi@Bn$77Q(yH}u@7wX~#~g>l`~ zCf&$x644Re)SZ(OQt1GUF-No21w$Jin2`_}wF;Uj8Bb1BmKHR7TD%j$t-NZ?sJ1Tl zo-%5AX|?J7egRxiu2aXd88zZ8>g>Xv7h|k{uc41iLQj2gw!j0>ERPl)%&ys1)FEEf zoXJ%JZAcG!};HwQ|K^W?MpU&s21ypa}+a(s!M+qv^1(HK9xr)@j4A?gg>7rw2G5Tm4sm zR|rTi8Ct+3zB*xALBeJ?xA4R%)L*F0*ig8`YnrlTx`8Z$Pe;@L!t(h()uP)9_F=z&f=}?Nf&)VO44;eb7xXb-YeL^(A1}3A3ep&0 z;pc029d%z~RKZvHTERCWcHfICRfl|X;f|JfTvE)e;&xxmSUP(jnV!3Pjy(!r1rlPq zcWJTEb-fQd{J0e^!Wu8LH zJVV>uQ?x%pB=a-YJwddlk+Um*h)K9|a0ML_9%37XxWw~`iOesE46Zk>Kx{{XCiGn^$m{_=pNeFa)^L zP8=ojW0V!HRn2ifuU9FZpqFY^IqrnbIsxsmYmjq`D3tr$pj9X9yZ}{yCnMCohLfI? zYg`2gIg=HYcve%g!R-x(lv7U0nyw0ZxbBr2c(~;ST#A=|n zK%hfBo(o{^@B&FV-PFnYW=;;f_?kI6gHg}PpI*Y+Gjy`)UE{1?_j4#&u`Xl7EZ5|7 zq_fM|_#NWe?!IMgn$0GEH;Z?|DCr8x9?v%Q5WS7Iy{^eJw$uQgASJ<8#@NIz?t0mW zT`bUkc4Ckj9$}uZ5$0L`UB)?FCwb;@k-tJO1LOZ!Y3@<7R%$P=VO&TiA08o(p_c*cDm1*b3BIDJ}^=>x7b z9bLKcu-53IqU9O9u!_tMF};O2khDIFaT`vz^4s z2niy3$y$;H005bjaLr``nRSz4&m)ui%`pOnc9UVxBa=|hL;@RnlVQ&zlTgkDlfKS3 z0uOzYVb3Fz8qY-mQ$lVQ&zllad@0uzjrVb3FzWsDn>e$Xlc6_1la(kYW| zj~0{Q(h!sR&>8{=l9NHwDU)E55R-t?5R+cf8UhxTlR?rclWvs}li<=2lf=;)0uz^$ zLDDai57ICK_L-AG(rE(FoReYCBa_e4I|3)4lVQ&zlP}Xq0%f9;Vb3Cyo6|4?5Veyb z)FPAb(=Y+(lOWVt0`9+)9l$)39@P+&$J81E!oidA!8?;4)hYp%lS$Pw1WK#$ZIgf1 R76Imymenf;Kg0k4003uUWfcGb diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 590f0e81..610ad4c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip diff --git a/library-image-loader/build.gradle b/library-image-loader/build.gradle index 3a909101..5c8f993b 100644 --- a/library-image-loader/build.gradle +++ b/library-image-loader/build.gradle @@ -19,10 +19,10 @@ android { } dependencies { - compile project(':library') - compile ANDROID_SVG - compile ANDROID_GIF - compile OK_HTTP + api project(':library') + api ANDROID_SVG + api ANDROID_GIF + api OK_HTTP } if (project.hasProperty('release')) { diff --git a/library-view/build.gradle b/library-view/build.gradle index c0675588..bb6073b7 100644 --- a/library-view/build.gradle +++ b/library-view/build.gradle @@ -14,8 +14,8 @@ android { } dependencies { - compile project(':library') - provided SUPPORT_APP_COMPAT + api project(':library') + compileOnly SUPPORT_APP_COMPAT } if (project.hasProperty('release')) { diff --git a/library/build.gradle b/library/build.gradle index c384c1b6..702b609b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,10 +14,10 @@ android { } dependencies { - compile SUPPORT_ANNOTATIONS - compile COMMON_MARK - compile COMMON_MARK_STRIKETHROUGHT - compile COMMON_MARK_TABLE + api SUPPORT_ANNOTATIONS + api COMMON_MARK + api COMMON_MARK_STRIKETHROUGHT + api COMMON_MARK_TABLE } if (project.hasProperty('release')) { diff --git a/sample-custom-extension/build.gradle b/sample-custom-extension/build.gradle index 91749f0a..dc6139d7 100644 --- a/sample-custom-extension/build.gradle +++ b/sample-custom-extension/build.gradle @@ -15,5 +15,5 @@ android { } dependencies { - compile project(':library') + implementation project(':library') }