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 6349fbeee..809bc7020 100644
Binary files a/gradle/verification-keyring.gpg and b/gradle/verification-keyring.gpg differ
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 @@
             <trusting group="commons-collections" name="commons-collections" version="3.2.2"/>
          </trusted-key>
          <trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework" name="checker-qual" version="2.5.2"/>
-         <trusted-key id="1d9aa7f9e1e2824728b8cd1794b291aef984a085" group="io.reactivex" name="rxjava" version="1.1.0"/>
+         <trusted-key id="1d9aa7f9e1e2824728b8cd1794b291aef984a085">
+            <trusting group="io.reactivex" name="rxjava" version="1.1.0"/>
+            <trusting group="io.reactivex.rxjava3"/>
+         </trusted-key>
          <trusted-key id="280bcdfa20225ff340f9e3a2fb52acb341119b0a" group="com.nostra13.universalimageloader" name="universal-image-loader" version="1.9.5"/>
          <trusted-key id="2bab4466b44f54f8f99bbbdd5ed22f661bbf0acc" group="com.almworks.sqlite4java" name="sqlite4java" version="0.282"/>
          <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb">
@@ -2702,6 +2705,11 @@
             <sha256 value="207839ab1011448bae3886fc36b6cb9fff1f5b3fa5f10cc79d242cee9dc1c3de" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.reactivestreams" name="reactive-streams" version="1.0.3">
+         <artifact name="reactive-streams-1.0.3.jar">
+            <pgp value="a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5"/>
+         </artifact>
+      </component>
       <component group="org.robolectric" name="annotations" version="4.3">
          <artifact name="annotations-4.3.jar">
             <sha256 value="8c10ec1a43ea8346b094a08eaf0aefbaaf749e1a80f10de6a70e7f8788735d03" origin="Generated by Gradle"/>