From 58806a69b534ab51eb250378e8bacdf3c200b273 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 8 May 2024 14:40:01 -0700 Subject: [PATCH 1/2] break conventions for the demo app --- demo-app/build.gradle.kts | 35 +++++++++++++++++-- demo-app/src/main/res/drawable/otel_icon.png | Bin 15961 -> 27738 bytes gradle/libs.versions.toml | 6 ++-- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index de5bd6049..13ed4d37b 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -1,18 +1,31 @@ +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import java.io.FileInputStream import java.util.Properties plugins { - id("otel.android-app-conventions") + // NOTE: We specifically do NOT use the "otel.android-app-conventions" here + // This is due to strict version requirements between the compose compiler and + // the gradle kotlin plugin. + // See https://developer.android.com/jetpack/androidx/releases/compose-kotlin + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("otel.errorprone-conventions") } val localProperties = Properties() localProperties.load(FileInputStream(rootProject.file("local.properties"))) +val javaVersion = rootProject.extra["java_version"] as JavaVersion +val minKotlinVersion = rootProject.extra["kotlin_min_supported_version"] as KotlinVersion + android { namespace = "io.opentelemetry.android.demo" + compileSdk = (property("android.compileSdk") as String).toInt() defaultConfig { applicationId = "io.opentelemetry.android.demo" + minSdk = (property("android.minSdk") as String).toInt() + targetSdk = (property("android.targetSdk") as String).toInt() versionCode = 1 versionName = "1.0" @@ -22,13 +35,26 @@ android { } } + compileOptions { + sourceCompatibility(javaVersion) + targetCompatibility(javaVersion) + isCoreLibraryDesugaringEnabled = true + } + + kotlinOptions { + jvmTarget = javaVersion.toString() + apiVersion = minKotlinVersion.version + languageVersion = minKotlinVersion.version + } + buildTypes { all { val accessToken = localProperties["rum.access.token"] as String? resValue("string", "rum_access_token", accessToken ?: "fakebroken") } release { - isMinifyEnabled = true + //TODO: Get minification working one day for compatibility testing + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", @@ -45,6 +71,9 @@ android { } dependencies { + // Required to be kept in sync with the compatible version of jetpack compose +// implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") + implementation(libs.androidx.appcompat) implementation(libs.androidx.constraintlayout) implementation(libs.material) @@ -67,6 +96,8 @@ dependencies { implementation(libs.opentelemetry.exporter.otlp) testImplementation(libs.bundles.junit) androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.test.runner) + androidTestImplementation(libs.opentelemetry.sdk.testing) debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) } diff --git a/demo-app/src/main/res/drawable/otel_icon.png b/demo-app/src/main/res/drawable/otel_icon.png index 3d24a34089ea40faf7b4066c84064b949d0953fa..e18e6baffee3b1b4fe729a5d4f55b5d1f5f4c4cd 100644 GIT binary patch literal 27738 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 literal 15961 zcmc(G30PCfw(br=TR~8;9Y7HS z;(!z2z&v*&U<(og3J3&HgoGJQkQwf(jo5a-d+xjEzH{#5``D>nwbsA>wW?}YrPj{b zojc6L<}8_mVVKyK&89zM7^xEd&muxiQu|tS_;B30Z8vpta?;%4;pcnu|GumI)n7J& zIVJj!J1j9t$)!uRv`kEP?mTe7!-L7Za3Mba@#Dh6%F33O{(k9ut9N4<<;)h-4ZD5q zyX!X`Ez*)a!};#yd==TB&dvWlG;2~Vrz1V}$hM>lgKqsvK{MN1^9TU`kNz(7IXxT* z)l8~MD<9q?f-!ABFVE+sJ1sH9u&Z0o#|Zp@ zruUwK3cPJ3?D%=(`b{x(OpB*!*nt%$m0U`vAHlE-HNN%^8mlp^T`}=+H5D}KTi3Q- z6v37b>g~#DA&XD<=_b+I+${T&?An2> zX0HX97OTF+NbfNLb9}Ri{Um{i(cY-I*qUM3vjj<*rVYfl8j`>k%$$@3MP=qDvAG_)W{> z*n(*s+$L`tALqjUY8P>2edU9U8Ghx7ldzxW|9>@zl*iPkokYsGWhhL!h)m%;!^Ec? zoNh*PQ_=d;jLUu1{#szze*=Lr6#qgSd_FMoHitMb{KV3*1XI%hSJQy`^FMwrc&S~u z`oPsmJ?Dj1X-BVE#7~9nKVzW!H>O%A|ITaqzfIHHdO#WE(Cqi?Z1tnt|0_7Wce7fto5S>44Ey)z*Y#J>sg{(3q;-u z$!tSLJ#deraML4D*@zS$CnB_11ddCdL+ZXbnmJM@kE4JL&jmW0P?(kjxk4dMAqpw^ zAoxc({0AZo$GUK&eEG%2Bz`QWJMR&>g{!OH%+)+QLH6vc<#0yVR z3b;L^ZgGkCiql99SncgCLdnT|&aj z_u*kLCZgYNH!bz3P)T0gPQk}>B~2=jnLvb{)Ga=fb&GE~J@SO|)HqnuU|*)HAJ0=A z5f2mRlhFf#5s?71!GygF#s$)bB@e2mv|$E76-=2aZ3H-_4budwV46_OI6O532+tV6 zGlIDURl5+L&=0T5m+!MQ=^%&Y%d@|HMl!cTYg;C1HyF|^)s3$Lv+J99cs18|=58b{ zm%&^KNItC#cHRN>s9t2eXlV95(4`v^<|1R^x5m*drt;*0Kz4#0Zd*nRcfipUF;qH$ zf0Pru$5GI-?W zabCe9h{vkzcw~Ax-hGoMl_;L`@p$Tr;=Qo}4}IkZq|SRo!VvckD}*Mh0CcSA5j8~6 z0gG}cSd&kDNV4Ll8>Fal>kghRy8|J>R3dCf;+LyH6vop!bxBDoY)Zgf!Ox54rDWX+RmL$>P?v@hA)~{^rKL|H?Y# z=2+AW+)tKSHqsv)+9CtgMid9>h-lwOy{egroHQNa>^NC>#LyU4`Vz3o7k`{!ok|eo z-o~pbBnpY@eB3*p7th~TkKj18O4?4kiYpo-d@`S`s(%T$DwG$>OWoKahoZm`XNZSY ze2Xw;l64B8b&jA>VaDFT-oUw*iYVRU{U7ivFhGdF<$d_%ub54Vysvf{aV&f$;>v*x ze7fQagB^b=1bsKfMHEO2*G+jN0;Cz&r??P+bl!HHi{CS!^)HSTnP8iW9exnem@Rfe zKdsV}y> z!1pP8iXA2Z>G3^kI6-Pqjz=0+oi zgqW$}A0|q;QvYmR&TdLc9XF-%s|2#){2rl(PMMG&MmLgpd-h>P#4F?lf@8*?LKJkW z5R;YyaATN45=Ec{@P*w+Udl&toTabI(4B6mtwCUVrbfskT=s;!*bp04~+`5GQ-pdYd>lR9xEHe?3h;jJJXGtN;M7oqMh6@ z_te6qweLE5R?$Y{+gsM?%W_s_1Wo!)kUIL1wlYL=q9qd7p(q- z6K^aRiRWvHns9!T@c|GWT@9uxV^i_#6Zaul!{`SfU0~cUZKke;Sju7vIN@ne|Ch5neTyNgyp&!@%(rm z+%v@EVF3XHEa3RHfNH-sqe8@AnvvWs9=QG&IX?OCat!pt2PnMIO%p&)U8avtCsZw=KywQDe@v(}m8x6l2jh7e)WJ2f| ztVE47&SBi4i3eTCnC*y){KoFP%3Z^e1QU+H(EHut`em++ASFyH(7ecVdDWQvYh;uy zsQV>kfft2zILCcIwYhjr)TPKnvCmjC;_*F+smFqC9>o|x-FJs?)9I+X&1c_0?rw~m zIyRWsZEeRn-=3jc^oUnXI9$?}tgjmuRA4BfEtO=kk6lKPEFEQA)sDs_^T`7@XZAQ% z3%gJD6BVqD;XJ+JRtLAv(JkzGfVI~d}UiG%5y7P~l;dpbAXsK30blg#WG zi=k5|L;ON-9t^A!v=aD6jL__Xu!-?gp(?L6#KT!ib4(f?|L{E`HLgj%aYyPE7%9T| zgR|`wrN=GGB#X`pX|Pahu^iMt3aRX9mDue%u8avf)|2jBF+!6GRQO#-wt7JRKqL7` z_1SP%MPq3D#ep$DtZJfc|HoKr^Ih2;Zq@^1WbFM&*F=rZqQJ!>%jmQY3aL`?u#uI- zzdyIR^7bPhraW^8hj#RLY0sC%LV5VMJ^tChdvW?n7|gt|piy($Mfq2G zQk68=3JXP!Yk=3VXO{Vuwgqhtr1M_JnnPG%$34o6b)y`_RRpqg4xHW2CVX7qTCWgw6BcP)J$GU~%cX<+M_s-Vt4%h1#c0`+h8=22$Is9QFDq9Yb zWuLK(X8}z9+IP;&Dj4~i$Xm7Ocl>pfW@!Z9)|qt&);F+EQ`+jddCIXfcDfsu0>?b;8E$Ktb>+T-*~GU8So3J%T@p;F&C|opk;) z=q39g&P}fH8@Vz~{pb4tJ0+ff0oBh56NhIY!+rzjr^+dqRJ{2nAK(8WeYrHX)pU1vcL>gD>ryHR@(UbqYg3jNW3nbI@)eTT&J+Df%I^0cf0(7b z+I-*EeZ29ws)DeDH|a+bc)8Ep8+*AqU1KSDBW{As*EOx{^4>U= z9|=V16Q%YlMx%whlhN%oWR}INdau3z8jYcage6KXBTG9IZ{0`JD1U3YkE|Dt5zzT0 zIVihzSOHC=jpR~VY#HSYp4zbN`M51_N5@PAE#V+vUrWiC=&(Zhsko!ZN;SQ4A;+F4 z>Uj|z3?#&BTVO-qcRYIznmn}do};u8Jc*MftV_2)J|cpuEyF2?El1>0vFPIhe^0V_ z2NCh0^*mXT*Dl269nX*Zjh4=YAv{udFs^>i7Bs!0Y4}I;#tLP01ZVe`4@$<6!TueS zl1OD|tNZ!a*Gml5)tL%q>E^qDMy`th3W_cv89ixQ3Jjh#D}=J?=EUCBXA7@L^$ zVz18a7_sfEMNQbl3*L6N@6N~yr(%3^b9ljn_BnE(>??Dvlb1S!ru0Unk|x*NqwHFI z=e$0FpCvYES3(-!JN=ye(!)Lh@b-ZYE}8|Mu=)@M8B!XOeP4fS|8^kR&PlusEAt~v0#(6ZQDuOW9!Yyv{lpJvC zHH~fch$sQR3q4<5WtG-F*9U{=^hz5PyrDBzysszcoy$5OjbOt1AR)&m8{1mhoa=G{ z-Iw*t#ueC$0NPJAAJUrfJVUN@Gt7!gT5q_VgqbEbIir%Mcs@jDt+)yM)#a=}I8lX2 zCh^K3r9)Y7d1!MVI%TTR%&Is&8O7O_{U?H&ZsCO)qEqF(7DsIzR`8y7`Yk`v{VC5n|oi+{!H$9KC0XKn^AuP!H_y?^#Rj5M~VK_cDdOg3Ka_9!c7W<0NHpG!O4 zwR}5FIG>uWzBi93=b>X1ceqx^9B!Qhbw&3b_b+r@En&j8`@#6OmuKiC3_XpTIVXG9 zKtywXF}i)H#TL%U8cSWft48W(!xP54@kXfJB!5zN(nCW7jr!_ynFUMO>{FKTX;#PA~Br0h^`{E}Xj>yzLF<6Y{%z@G8 znPCz)s*;@8;q0Djs}Rp?&$Nk`*lug3vwIK?%DmWmUhZ4_rjnc#I7<_7MFNjGD)bya z8>9?(eqD2g_rnM1my}0zVYpg0{vP|LRG_Pyr#vDJ_mQr~&%BQ~y7t_OFslXcu4W!- zxLy$`)`yN(wLR^Yl?g^GayhB%Vjiuzz53iPSUUVd2h!9?G?|RouhdAcxeHOV z_twRk-S5-Aqc5MZ%!N^vlUg%t-=^SWG54S!#?B2WaBE-kKR0QE8FQD@P5Z7lyx3?U z!=Qa?RLc&N5_y;BW5@82f@@CxC&9N1OJxx)j|?WP1{;+*Baf;qtDw2`xw1~snL z6@=7QB*=D;56rNg~o8L-$D(&MAfLc{kQ{Mi^YQvvO_P{};UtN{U_q1Nl(Yth= z5LH>2jAzqs1I=f#$J8{( zxBSjBKojWDgYws=i(||`KSLw?T4u%LPsI`?*VN&Ww756ZUrBg%^w?sI;-ljBDR8K- z!mr@woOoWv^E4IsZoiE!2WPspxHh+^DMfZQ&B{0e=gjECSe>BknGlV$F2^!8^E=$E zVdNW@yv+WzzH$6Vn65pqf7^7tMrp+v-x(NX(7RKaTd1)$mFC%#hEaH3i@tkfc8w7n zWDiH0My1)}JD#ftYgB~0Fj%a}8f?e-$=-RCS+M!!0K1pdDslkjc9Rq0+bYhb9$Er}X zS`iaAcYj&uwnp+%5AT(|lSEhvX2kZb5k4yG{C*j9a9WMQf{d|Ox+^5WyZfO!o@cI# zlW&BRBTKjFQ-{-g+-G z(UnEwlc@@w$0He!ggckT^JZno&xI%bSh5~}<7?*^OMz6nPq~Wy8&Lhu6^Kj~4TbX#9 z6@K1d`D`jG$w{-p{4BMx8geIklFc>A&K%lQQ`H2N~eLifoYS87@0 z4tpX|?(W*4#qO)&;JxzUn{CC{&Z2d4)`;Bqf9SNoxmXBmFORmZ^RnepN1J*lJZ^z; zmsUEOzqB0}6+u134v!TbN8?HN?v?iJlHk*BVrbz^QQ_MsWSCFIucyv;Y?!zT_LYLv z9>-SmW2MDiVbQSa-|gGY*`U=~JNL zT+Url8U{YzJ)jhI4!J(sHkQDh0bhMnQDEdkbyslGsMHvIn+0 z_WFgY>wUO*2IV~}%VO&W#Ctv0`@`Ogt^FjnzE?b|QVcRpJ5~p;tY~PVX&mK3I2%_l z+_U4+z|AyctKw!6q5S%?*s6e9{-s~s>d^GIi3=+$sff7-8yNM3NR1U4gUWOrc;YwM z*o^PCtcS zy#6!S%JKB)adXif^-8rt{RW?;d3^Hcnwq$KcSF5a#yCxk!Xvq)(T99WknZj|NRfk8 zAnd;Gce*3S#wy|%WyM|ZKNi2*v+>-Zm!>mKzN9oKq zVS5gDS@(q~s9IeMkJG_~@|K>Zv1MvCEtj*#w4vLyrL8_3`@F8wZXt;gaX<4-T$Z!V zl2F=v$aziOS;|h|&1W~B&yIXcTY>sCGgjM;_tL7M+!%I}N(YaJ#O_KfKCPSa5}b{` zYM+yt(B%iag4VeYPQARt4}#$mviz=9`=gbV!M5F%G+T9@Glzbn)(TWGO6i+5r&8AM z5w7HU!FI+ot-Nv%otkp|P>waZlIF|ue^)Q2Q>-5H^cOfv>^sN^iEVJrxX-eI7>8JB zpHkt~MCF$r{9arrugM|lw{_P$uKw-GtG72ClbEG`{t?l9sz#x5yU!oN6+ZizAxhjw z{R=1$Y?+MSi_%`7Yt{=S_+j)Qai<)78HJxz6=Sed7nL5`KU zNt9r7k00<WKz&6c?>&$*8DGXKRi3XY0Q70d^ zr-r}tPE=XpNK!bLS#--x7{{$}nzxJPMpl;Kw^UgTeV9KU9n-nTK+`N@t#TE=EQTBN=eZ*T3uz?ge&cJg)G8~Qb~hbq;jDqu2F zUShGCt>uBX(XmUSr;2yq=sp5l+07?PGo#<=?jQ_#tn8&ZjM~a)Sg&gFA2jHfdZs4O z)tXPD7m)f64$wTWh7waM-?^0EJ$!uSTIwU|{wJdp--u!P<16J4HWVgSzS~&Ni>Yo| zB1by(zQyJjC;BQr(<1Spbl}I3UU{O{hlnl*XG40a**<1z@17R5D1Uwg(WfPFP`}?u zKKr@{WRV{7-F^5Gvwd1D2e!fYZUZRQWo z5LGZL`Oe{1>kR$=C;pV7`NS-dnky;HhYnA&7I{{9dWxG=KFLZyXU_FJZO~sScKTJ? zFsW5bl0@%1X(oL7>PcnP6Y0XpUWr1%#&Xv<ahL%?}nIGM&q4YT$lSZhVO~ zf<(&3k3VvTet&KIVxM_K^#hfH zD=Ry1YaCQTIfZpqu5m<2f((8>ANh~~g%k(RSEF9)2_#5LRNfkeGTM--a?nRc0*nI9-wQXEL$PzEpb_K-n5Ykfx(3js&ETJb)= zaT3CtcI@>Xb?xbCrF;S$Ji71M)fTmfI#qwnfw%X~sI?(N<@N4pK&bx3s!_33>sNlK80JHa&f1>w3gl zEh57I~$Sj857ifDScacmi|qJ_2UMz`v>+=H~*fNgcgP8zD* z9yi>bmsD~Ol1g3V5ObXdsm5g`B9OJM=%u^T_V)~=hX0CU@yxiEd}SmzG6Rx742@3L z{G@cFzRBVU?%}=jOn1qi-ypAD66&d-{Q~kX8_dnk(*{>O8dwmQ7j1w-?wr)B*ViiR zWv4g;u{yk*J$d<7@h4xDIDTYPFiz?6>uR{o4#hWAU%XmprJ3Op(E%O(o}8SA>$B+OkxdC9|4lV;Xk=gyhCtrcM{VA_oiN+*&H*t`R!MlkQGz{K6j3dHJjlBPz>X9+r+NeCdHc6R8 zB*0yGHB#`esOC)~SS}BPw=sut*g$c3%aZl4s5a`tVU1Am*ue<47X?o^_Gfh*{FG)o zoWX$s&z#N3vxz2B)WqGY)|)qINj<3dA)VJt%7BLgMd{hPH8DQpk7Fi%mT*!NQ6|^RFc-j;^|~ zo{C8_jC5T;>|JM7E_8D!mVuS>hp1n<0Y2G}+8xrw25IJ zF|<1ysu~6wSq9i^o1lY>gYWV_HxgQ&eh6uQw}R1&s{Mn0I$BRF`6PpR*ne6@l+MkMGwcRS|d~ybq z*xf7E@yS*MYr=sStOP1MZ$FV~<1Otl7z>Sg#3c@&V?(eFYL>wdBxWP^SRE~;lF$-68fxKRu?5?U$d zm{jUSG}GqNF;U7bcSw*BB)GhXM)Euu-KU(M6?SitI2a-P^M{ftj@FjGZh z#I(dK{2`l+IV!SPL=(H?@KP?e>0Sa4%UqPm!#vnU)ig|xrvhpIShVQsp{4xl zr+&cc)R_!n5f7|}*Iby1E}*uK3yb=h#+h(`-vuDgq(Wu6pDz>#e*OFM3@cQ=&X+a* zFM9#NhyBRkwhCx3FtwBTvQ_xomIB`@{AV!V$U*bemg1`%g@iZ%X>JX+_!9|%ze}RKY$q(jv0UMHL3m;eox2WwaGO6@bZM>>Q9pnWae*J z-)Wubw4j3zle063X#3C#uW>=Ipl#CE0@`Qb8;P%lzck}=U3b1wi023Ue~Z!7Gqn|) z0vRdzi$9t$V5Xu!I$bXeLi;-uhrH&gKF6qigVSQDetbS=!f__Rt6d-?0Xs-+r_cyS z2h@(jKQ#0a|LI0&?4MTo##kKC7>^nT>nV#-(H6hH2!J^Hw*#4ipACWJawP&5=H@Mi zNpa16;GPl)?Gb!TlGt4t+OKz5-(=*en7Rw*{y@1_k7y6DSShLekI@^kE^~!!uLLt`b6wOu|D~ zl4_v@d*yiO<$@}te+>AIZ=SB}LpI@Qx>M+a6T^uhRkx!c7s&RV=IL-B1bt3J*9TcB z0H7Muu|hfpPWn)!;a9Uxpg=hbwZV7AArA1&G~qSj)QL zxOv!xvf5Fz3Ux26kdYtUVhuiB>}d!Q3Rsh(*yGQG8HP1+-aSiCZ;+i6-(q$$H1wAR z-)~lHn!L>QvRdL(phY{I;rA;E+ga~r6SrIjJ3w}84>%iuF{|ur??vhIu)@?EwM?E7 z^&n>QHhAs$Bid~e{J^=@{53oM%8(pZm|Igb%42q!aie5K{?X5-QGG69_|n#(-PCP% P=xz&jhiUQ;2TuM6{VG!e diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f23a13b6..8c00c38cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ junit = "5.10.2" byteBuddy = "1.14.14" okhttp = "4.12.0" spotless = "6.25.0" -kotlin = "1.9.24" +kotlin = "1.9.23" [libraries] opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom", version.ref = "opentelemetry-instrumentation" } @@ -62,7 +62,7 @@ byteBuddy-plugin = { module = "net.bytebuddy:byte-buddy-gradle-plugin", version. kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } # demo-app -androidx-core-ktx = "androidx.core:core-ktx:1.13.0" +androidx-core-ktx = "androidx.core:core-ktx:1.13.1" androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" androidx-compose-bom = "androidx.compose:compose-bom:2024.05.00" androidx-activity-compose = "androidx.activity:activity-compose:1.9.0" @@ -86,4 +86,4 @@ junit = ["junit-jupiter-api", "junit-jupiter-engine", "junit-vintage-engine"] [plugins] publishPlugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +#kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } From 3b7289e6cedeb6752f338dca4f57f18268e4239e Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 8 May 2024 14:47:39 -0700 Subject: [PATCH 2/2] spotless --- demo-app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 13ed4d37b..5c0df3fba 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -53,7 +53,7 @@ android { resValue("string", "rum_access_token", accessToken ?: "fakebroken") } release { - //TODO: Get minification working one day for compatibility testing + // TODO: Get minification working one day for compatibility testing isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"),