From 797a268d6c34d684e3cc26cd37ad1494fe230fde Mon Sep 17 00:00:00 2001 From: amaa-99 <-> Date: Sat, 29 Jul 2023 23:58:07 +0200 Subject: [PATCH 1/2] * [Issue #11] Remove unused dependencies from the build.gradle configuration file. Removed the unused dependencies from the build.gradle configuration file. --- app/build.gradle | 5 ++++- app/proguard-rules.pro | 11 ----------- app/src/main/res/raw/about.html | 4 ---- build.gradle | 7 ++----- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 82ecad0da..84d3215d4 100644 --- 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' } @@ -63,7 +67,6 @@ dependencies { 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 "org.ocpsoft.prettytime:prettytime:5.0.6.Final" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 77c7c7d51..bc15fdec2 100644 --- 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 { - (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 index 27b000dd9..3d8e9a49f 100644 --- a/app/src/main/res/raw/about.html +++ b/app/src/main/res/raw/about.html @@ -292,10 +292,6 @@ DBFlow MIT - - RxAndroid - Apache License 2.0 - RxJava Apache License 2.0 diff --git a/build.gradle b/build.gradle index 81560e49c..46fd05bc7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,7 @@ buildscript { 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" } 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() } From 6801fa86a5db64d46135e09cbcfb0f67dd92d15e Mon Sep 17 00:00:00 2001 From: amaa-99 <-> Date: Thu, 27 Jul 2023 00:22:28 +0200 Subject: [PATCH 2/2] * [Issue #11] Remove unused dependencies from the build.gradle configuration file. Minor code reformatting. --- app/build.gradle | 31 ++++++++++++------------------- build.gradle | 2 +- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 84d3215d4..86055a830 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,28 +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: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/build.gradle b/build.gradle index 46fd05bc7..eee717216 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +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://plugins.gradle.org/m2/" } gradlePluginPortal() } dependencies {