Merge pull request #1342 from amaa-99/11-remove-unused-dependencies-f…

…rom-the-buildgradle-configuration-file [Issue #11] Remove unused dependencies from the build.gradle configuration file.
ukanth · Aug 14, 2023 · ec4bdf0 · ec4bdf0
2 parents bef1b28 + 6801fa8
commit ec4bdf0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 41 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
+
 android {
+
     compileSdkVersion 33
     buildToolsVersion '33.0.1'
 
@@ -27,10 +29,12 @@ android {
             proguardFiles 'proguard-rules.pro'
         }
     }
+
     lint {
         abortOnError true
         disable 'MissingTranslation'
     }
+
     namespace 'dev.ukanth.ufirewall'
 
 }
@@ -43,29 +47,21 @@ dependencies {
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:service:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:nio:${libsuVersion}"
-
-    implementation 'eu.chainfire:libsuperuser:1.1.0'
-
-    implementation 'com.github.ukanth:android-lockpattern:8.0.4'
-
-    implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
-
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.annotation:annotation:1.5.0'
-    implementation 'androidx.core:core:1.9.0'
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-
+    implementation "eu.chainfire:libsuperuser:1.1.0"
+    implementation "com.github.ukanth:android-lockpattern:8.0.4"
+    implementation "com.afollestad.material-dialogs:core:0.9.6.0"
+    implementation "androidx.appcompat:appcompat:1.6.0-rc01"
+    implementation "com.google.android.material:material:1.7.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.annotation:annotation:1.5.0"
+    implementation "androidx.core:core:1.9.0"
+    implementation "androidx.preference:preference:1.2.0"
+    implementation "androidx.legacy:legacy-support-v13:1.0.0"
     annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${dbFlowVersion}"
     implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbFlowVersion}"
     implementation "com.github.Raizlabs.DBFlow:dbflow:${dbFlowVersion}"
-
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.5'
-
+    implementation "io.reactivex.rxjava3:rxjava:3.1.5"
     implementation "org.ocpsoft.prettytime:prettytime:5.0.6.Final"
     implementation "dnsjava:dnsjava:3.5.2"
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -4,16 +4,5 @@
 -dontpreverify
 -dontoptimize
 -dontobfuscate
-
--dontnote org.xbill.DNS.spi.DNSJavaNameServiceDescriptor
--dontwarn org.xbill.DNS.spi.DNSJavaNameServiceDescriptor
-
--keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-# Only required if you use AsyncExecutor
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(java.lang.Throwable);
-}
-
 -keep class dev.ukanth.ufirewall.** { *; }
 -optimizations !code/allocation/variable
diff --git a/app/src/main/res/raw/about.html b/app/src/main/res/raw/about.html
@@ -292,10 +292,6 @@
         <td><a href="https://github.com/Raizlabs/DBFlow">DBFlow</a></td>
         <td>MIT</td>
     </tr>
-    <tr>
-        <td><a href="https://github.com/ReactiveX/RxAndroid">RxAndroid</a></td>
-        <td>Apache License 2.0</td>
-    </tr>
     <tr>
         <td><a href="https://github.com/ReactiveX/RxJava">RxJava</a></td>
         <td>Apache License 2.0</td>

diff --git a/build.gradle b/build.gradle
@@ -5,10 +5,9 @@ buildscript {
         google()
         jcenter()
         maven { url 'https://haibison.bitbucket.io/maven-repos' }
-        maven { url "https://plugins.gradle.org/m2/" }
         maven { url 'https://jitpack.io' }
-        maven {  url "https://maven.google.com"  }
-
+        maven { url "https://maven.google.com" }
+        maven { url "https://plugins.gradle.org/m2/" }
         gradlePluginPortal()
     }
     dependencies {
@@ -22,9 +21,7 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven {
-            url "https://maven.google.com"
-        }
+        maven { url "https://maven.google.com" }
         maven { url "https://plugins.gradle.org/m2/" }
         gradlePluginPortal()
     }