diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd8c..237047402 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2a0c5fca9..307d63d33 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,26 +32,15 @@ android {
applicationId "com.celzero.bravedns"
minSdkVersion 23
targetSdkVersion 30
- versionCode 12 // For version name 053a
- versionName "0.5.3a"
+ versionCode 13 // For version name 053b
+ versionName "0.5.3b"
vectorDrawables.useSupportLibrary = true
- /* splits {
- abi {
- enable true
- reset()
- include 'x86_64', 'x86', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips'
- universalApk false
- }
- }*/
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- /*ndk {
- abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
- }*/
}
buildTypes {
release {
- minifyEnabled false //Disabled this option for open testing to get more log details
+ minifyEnabled true //Disabled this option for open testing to get more log details
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
@@ -91,9 +80,6 @@ dependencies {
implementation "com.google.guava:guava:30.1-android"
- /*implementation "com.google.guava:guava:30.1-android"
- implementation 'com.google.guava:failureaccess:jar:1.0'*/
-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
implementation 'androidx.core:core-ktx:1.5.0-beta01'
@@ -116,7 +102,6 @@ dependencies {
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"
- /*implementation "androidx.room:room-coroutines:2.1.0-alpha04"*/
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
@@ -125,7 +110,6 @@ dependencies {
implementation group: 'org.jsoup', name: 'jsoup', version: '1.8.3'
//For paging - connection tracker
- //implementation "androidx.paging:paging-runtime:$paging_version"
implementation "androidx.paging:paging-runtime-ktx:$paging_version"
implementation "androidx.fragment:fragment-ktx:1.2.5"
implementation "com.google.android.material:material:1.3.0-rc01"
@@ -135,9 +119,6 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
playImplementation 'com.google.android.play:core:1.9.0'//for new version updater
- // For go-tun2socks
- implementation project(":tun2socks")
-
//Glide implementation
implementation 'com.github.bumptech.glide:glide:4.11.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
@@ -161,4 +142,7 @@ dependencies {
// To use only without reflection variants of viewBinding
implementation 'com.kirich1409.viewbindingpropertydelegate:vbpd-noreflection:1.4.0'
implementation 'com.kirich1409.viewbindingpropertydelegate:viewbindingpropertydelegate:1.4.0'
+
+ //Tun2socks
+ implementation 'com.github.celzero:firestack:f78e9b50a1'
}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b424510..86ac54828 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -16,6 +16,11 @@
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
+#Dont obfuscate
+-dontobfuscate
+-printmapping obfuscation/mapping.txt
+-printmapping /build/outputs/mapping/release/mapping.txt
+
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
diff --git a/build.gradle b/build.gradle
index 00480916c..c647a4443 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,6 @@ buildscript {
repositories {
google()
jcenter()
-
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
@@ -20,6 +19,7 @@ allprojects {
repositories {
google()
jcenter()
+ maven { url 'https://jitpack.io' }
}
}
diff --git a/tun2socks/tun2socks.aar b/tun2socks/tun2socks.aar
deleted file mode 100644
index b2fb884da..000000000
Binary files a/tun2socks/tun2socks.aar and /dev/null differ