diff --git a/app/build.gradle b/app/build.gradle
index bfe0aea8..3dd1eadf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,26 +2,36 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
+    ndkVersion "22.0.7026061"
+
     defaultConfig {
         applicationId "com.emanuelef.remote_capture"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 15
         versionName "1.2.12"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     externalNativeBuild {
         cmake {
             path file('src/main/jni/vpnproxy-jni/CMakeLists.txt')
         }
     }
+
+    compileOptions {
+        encoding "UTF-8"
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     packagingOptions {
         // NOTE: unstripped nDPI library takes up about 4 MB!
         //doNotStrip '**.so'
@@ -29,15 +39,14 @@ android {
 }
 
 dependencies {
+// AndroidX
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.2.1'
+
+// Third-party
     implementation 'cat.ereza:customactivityoncrash:2.2.0'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    testImplementation 'junit:junit:4.12'
 }
\ No newline at end of file
diff --git a/app/src/main/jni/vpnproxy-jni/CMakeLists.txt b/app/src/main/jni/vpnproxy-jni/CMakeLists.txt
index 6e7419fd..73ee9a70 100644
--- a/app/src/main/jni/vpnproxy-jni/CMakeLists.txt
+++ b/app/src/main/jni/vpnproxy-jni/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10.2)
 project(vpnproxy-jni)
 include(ExternalProject)
 
diff --git a/build.gradle b/build.gradle
index 6cba4f3b..81a3c060 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,11 +4,10 @@ buildscript {
     repositories {
         google()
         jcenter()
-        
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
-        
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -18,7 +17,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
     }
 }