From 5fad229dbeb9caf1bd12df85892346fc5faabf85 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sat, 24 Oct 2020 11:04:55 +0530 Subject: [PATCH] Update RxJava to version 3. --- app/build.gradle | 9 ++++++++- app/proguard-rules.pro | 7 ------- gradle.properties | 3 ++- gradle/verification-keyring.gpg | Bin 220017 -> 222274 bytes gradle/verification-metadata.xml | 10 +++++++++- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d1be9151..224cf0e6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -139,6 +139,11 @@ android { exclude 'META-INF/INDEX.LIST' exclude '.readme' } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { @@ -162,9 +167,11 @@ dependencies { implementation 'commons-io:commons-io:2.6' implementation 'commons-net:commons-net:3.6' implementation 'ch.acra:acra:4.9.1' - implementation 'io.reactivex:rxjava:1.1.0' implementation 'com.hannesdorfmann:adapterdelegates3:3.0.1' + implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' + implementation 'io.reactivex.rxjava3:rxjava:3.0.7' + implementation 'com.fasterxml.jackson.core:jackson-core:2.11.1' implementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.1' implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 045bbd72a..a00690fad 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -31,13 +31,6 @@ public *; } -# The rxjava library depends on sun.misc.Unsafe, which is unavailable on Android -# The rxjava team is aware of this, and mention in the docs that they only use -# the unsafe functionality if the platform supports it. -# - https://github.com/ReactiveX/RxJava/issues/1415#issuecomment-48390883 -# - https://github.com/ReactiveX/RxJava/blob/1.x/src/main/java/rx/internal/util/unsafe/UnsafeAccess.java#L23 --dontwarn rx.internal.util.** - -keepattributes *Annotation*,EnclosingMethod,Signature -keepnames class com.fasterxml.jackson.** { *; } -dontwarn com.fasterxml.jackson.databind.ext.** diff --git a/gradle.properties b/gradle.properties index 5465fec0e..3c43fbad5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +org.gradle.jvmargs=-Xmx4096m \ No newline at end of file diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg index 6349fbeee46b66c0d845e4fe5e1c1fc0b90a422d..809bc70201a76e8a7a87eaba3c6354724a7b1257 100644 GIT binary patch delta 2266 zcmV<02qpLNwhh9_4S<9JgaWh!aa(_x0u2ORRi94*5CGtO>#1H6aml^y)=a}Su6^dp zNv7Dvg zmE-}kxzBW|<(6Z%j}NJ zr5=wbhSLshoYA1)Fg-C82f=@h)yQt-W13&J?8~oHLmSAml$Y$-dB89Nll4*2I`Zj~ z@TQny$>aBFf$wAoe&_5i3piXJln@SgvxXL6d1*iGJ(T|It?aQT3+$0L944J+pf4v2 zCv$jo6m?aD(J^G}Y=04{e$l3*nh9CGpsZH3hy$?|zMR-QE4<9Hpn`w;lkHP|W4rf? zM={mI{eq>+*{QbBl@SI+_s_q4(&qO6tN}Cm1VAaux`?u`M|VGlE>kI(HY0{t@XR!7 zgmQvQyBEkQBjtpe@!)ry4tS3ylwp9NOcH(sD)!m=5{zjs+{5wUxi*m^VwDXv#bV~@ zSagqOVcK|E@S%3cIwE94?=yGlxA%vk^r~_#YZU+y0RRECC01!`bZ>GXOKf3oXCORw zX=`+EaxQCZVQyzYXKi6=Y%XJOZ9a(tP6QJH2mm-1Aq40;tGkuTH$xsELLfsRJLQi_ zN1X)%T~(h?0viL9A%+}(Lm)flk4Zd{0Inl>aTz{) zH9mvxEVSGLz(S-M>RvG9(eQquYsR|6>mkr*0@hzG?w?p1qIw#Q#C1ByTIbN>v`x^| z3sjB2Wnn(0m!z%4<%TFMz*xkK7|yeJeZA(QNZN8BB=PmkQNqfhHxFL29P*)Fdl_HP zkTNbENDk(YY@eWicx?RGL?t@W6A$vnvwx-pm^Ts8C{dbx-5ln+7u1(^p9hdCS!WgD zP9B94$=>PVV~d}R3N7q1ho|Al)qfR{Ra4h}#xn*`kg)~xS9*VWer*?uE2Nd|a@&8l z!;7LsC4=*=Q|xiYicNxWw-kdw>B!!wj784SI!A1E<|M*@30A?@mGhfgY?B{t^sMV= zJS))01%OSSc^bm|pn9TFWjc5)kpmY!P#ILYeH}*pS{S0|+rOy;3i%F8`FnzqM+GCc zDAz~@ffLI9$NUuh64$`!(_3b-M*z^Uy62y_c^msX_+{T)Xf-xdIIYT~(h?0T2Miv_YRqve``TA}Ffh*wllX za4PlzqqMou^T_GU#u4jKbg3k+YTqMJ7s}X?E|0}?5;5dqX)p+8YhOSr*Vb)hQ8A(r zFx9(ciEBrX!g318EiRc2`Quq1o_TiCj;lEjMyo4-R~u%m9#yb@_?%@XvSh~Y<9m1^ z+oSAOUitgZ2_i9Kg3r%cdyCxSM05zD&|=S~C0Q0zC#uwBI!|K>~3C{VUp z0Z@bTFhQylrZP7E5So`_F?WX{d=f5S`bM{Zzshp8TQK6=4V21JCUge)CF+HfKX*~U z<~Y78s?Ju-n5-yEn+r5j-o|_#5fYKjVp2y9>FoCg*XjY|zVr&2FH=nBzA;-}*+l-n zB!HbCr>akAkwSs2ZgG|hczy2mC1!p`a4Ycs6kiRSQVC$*UFJFVsAenT63rWUh* zoz|?DVRpP_T;9|y@yFDMBw$o@CMO4trwFP7R1CcU5di=Ji2^nR7y$?XAQmA6=sK&r zmC83m9w0&>Lm)flk4Zf>EQC>HX4SxJ2@ur(V2 z1%D|gvFm};S#i-ylVHsghb5LEoEJe=UcJ0Zf_pN?LSP*{0HwIXo1X_C<9)Y(Vl!@t z%HA>l-Kx%m(g`JxjEqg1`9qd9Y*8LFcuIn{ULON)bkuO6Zx){}Wyvk1Ug3ssv(&II zK}I`@pjl=g1=d1V7c28dv4Av%^%Eg4NZ}_Ut!l>)tm1#xKGnO6PB9E&&b3hdEYw@z z^xl*2^tBDAYVvr7Wop#JGcMs^@?adRNXFBVXVLNPtzI;?Q_faDRAK8aqA5L*s0N5< oIs$Ua{Mz5(#?2aP?j>GxjWgM|8%NvUieD0O4%uaFINH!?;;dCXNdN!< delta 15 WcmX?fg7@P#-i8*&7N#xCh0y>yg$7yx diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c09689f64..9e93bb9f8 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -16,7 +16,10 @@ - + + + + @@ -2702,6 +2705,11 @@ + + + + +