Skip to content

Commit a6e2abc

Browse files
committed
Change in build process
The Tun2socks.aar file is no more included as part of library. Added jitpack.io in the build process to include the Tun2socks library. (com.github.celzero:firestack:<<ID>>) Changes in proguard-rules.pro file to add the mappings.txt file in the release. (Obfuscation mappings)
1 parent 12cc2bf commit a6e2abc

File tree

5 files changed

+17
-23
lines changed

5 files changed

+17
-23
lines changed

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,15 @@ android {
3232
applicationId "com.celzero.bravedns"
3333
minSdkVersion 23
3434
targetSdkVersion 30
35-
versionCode 12 // For version name 053a
36-
versionName "0.5.3a"
35+
versionCode 13 // For version name 053b
36+
versionName "0.5.3b"
3737
vectorDrawables.useSupportLibrary = true
38-
/* splits {
39-
abi {
40-
enable true
41-
reset()
42-
include 'x86_64', 'x86', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips'
43-
universalApk false
44-
}
45-
}*/
4638
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
47-
/*ndk {
48-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
49-
}*/
5039
}
5140

5241
buildTypes {
5342
release {
54-
minifyEnabled false //Disabled this option for open testing to get more log details
43+
minifyEnabled true //Disabled this option for open testing to get more log details
5544
shrinkResources false
5645
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
5746
}
@@ -91,9 +80,6 @@ dependencies {
9180

9281
implementation "com.google.guava:guava:30.1-android"
9382

94-
/*implementation "com.google.guava:guava:30.1-android"
95-
implementation 'com.google.guava:failureaccess:jar:1.0'*/
96-
9783
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
9884
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
9985
implementation 'androidx.core:core-ktx:1.5.0-beta01'
@@ -116,7 +102,6 @@ dependencies {
116102
implementation "androidx.room:room-runtime:$room_version"
117103
kapt "androidx.room:room-compiler:$room_version"
118104
implementation "androidx.room:room-ktx:$room_version"
119-
/*implementation "androidx.room:room-coroutines:2.1.0-alpha04"*/
120105

121106
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
122107
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
@@ -125,7 +110,6 @@ dependencies {
125110
implementation group: 'org.jsoup', name: 'jsoup', version: '1.8.3'
126111

127112
//For paging - connection tracker
128-
//implementation "androidx.paging:paging-runtime:$paging_version"
129113
implementation "androidx.paging:paging-runtime-ktx:$paging_version"
130114
implementation "androidx.fragment:fragment-ktx:1.2.5"
131115
implementation "com.google.android.material:material:1.3.0-rc01"
@@ -135,9 +119,6 @@ dependencies {
135119
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
136120
playImplementation 'com.google.android.play:core:1.9.0'//for new version updater
137121

138-
// For go-tun2socks
139-
implementation project(":tun2socks")
140-
141122
//Glide implementation
142123
implementation 'com.github.bumptech.glide:glide:4.11.0'
143124
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
@@ -161,4 +142,7 @@ dependencies {
161142
// To use only without reflection variants of viewBinding
162143
implementation 'com.kirich1409.viewbindingpropertydelegate:vbpd-noreflection:1.4.0'
163144
implementation 'com.kirich1409.viewbindingpropertydelegate:viewbindingpropertydelegate:1.4.0'
145+
146+
//Tun2socks
147+
implementation 'com.github.celzero:firestack:f78e9b50a1'
164148
}

app/proguard-rules.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
# debugging stack traces.
1717
#-keepattributes SourceFile,LineNumberTable
1818

19+
#Dont obfuscate
20+
-dontobfuscate
21+
-printmapping obfuscation/mapping.txt
22+
-printmapping /build/outputs/mapping/release/mapping.txt
23+
1924
# If you keep the line number information, uncomment this to
2025
# hide the original source file name.
2126
#-renamesourcefileattribute SourceFile

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ buildscript {
55
repositories {
66
google()
77
jcenter()
8-
98
}
109
dependencies {
1110
classpath 'com.android.tools.build:gradle:4.1.2'
@@ -20,6 +19,7 @@ allprojects {
2019
repositories {
2120
google()
2221
jcenter()
22+
maven { url 'https://jitpack.io' }
2323
}
2424
}
2525

tun2socks/tun2socks.aar

-13.2 MB
Binary file not shown.

0 commit comments

Comments
 (0)