From cfb61592b5569480ada87d8263166298691960c2 Mon Sep 17 00:00:00 2001
From: sk13 <sk13@5a230232-f31e-4839-b85c-661838634aa0>
Date: Fri, 7 Jan 2022 16:12:47 +0000
Subject: [PATCH]

---
 app/build.gradle | 76 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4cf913c..eb7ace9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,19 +13,19 @@ android {
     signingConfigs {
         JAPTeam_release {
             keyAlias 'jap'
-            storeFile file(RELEASE_STORE_FILE)
-            storePassword RELEASE_STORE_PASSWORD
-            keyPassword RELEASE_KEY_PASSWORD
+  //          storeFile file(RELEASE_STORE_FILE)
+   //         storePassword RELEASE_STORE_PASSWORD
+   //         keyPassword RELEASE_KEY_PASSWORD
         }
     }
-    compileSdkVersion 28
-    buildToolsVersion '29.0.0'
+    compileSdkVersion 31
+    buildToolsVersion '32.0.0'
     defaultConfig {
         applicationId 'anonvpn.anon_next.android'
         minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 15
-        versionName '00.00.015'
+        targetSdkVersion 30
+        versionCode 21
+        versionName '00.00.021'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -46,28 +46,59 @@ android {
             abortOnError false
         }
     }
+    flavorDimensions 'RemotePCAP'
     productFlavors {
+        noRemotePCAP{
+            dimension 'RemotePCAP'
+        }
+
+        withRemotePCAP{
+            dimension 'RemotePCAP'
+            applicationIdSuffix ".withRemotePCAP"
+            versionNameSuffix "-withRemotePCAP"
+            minSdkVersion 24
+
+            packagingOptions {
+                exclude 'META-INF/DEPENDENCIES'
+                exclude 'META-INF/NOTICE'
+                exclude 'META-INF/LICENSE'
+                exclude 'META-INF/LICENSE.txt'
+                exclude 'META-INF/NOTICE.txt'
+            }
+            compileOptions {
+                sourceCompatibility JavaVersion.VERSION_1_8
+                targetCompatibility JavaVersion.VERSION_1_8
+            }
+        }
+
+
     }
     externalNativeBuild {
         cmake {
             path 'CMakeLists.txt'
         }
     }
+    ndkVersion '23.1.7779620'
+
+
+
 }
 
 dependencies {
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha05'
-    implementation 'com.google.android.material:material:1.0.0-rc01'
-    implementation 'androidx.drawerlayout:drawerlayout:1.0.0'
-    implementation 'androidx.preference:preference:1.1.0-alpha05'
-    testImplementation 'junit:junit:4.12'
-    implementation 'org.osmdroid:osmdroid-android:6.1.0'
-    def anonvpnlib_version = "00.01.104"
-    def anonlib_version = "00.21.018"
-    def bouncycastle_version = "01.56.003"
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.android.material:material:1.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    implementation 'org.osmdroid:osmdroid-android:6.1.10'
+    def anonvpnlib_version = "00.01.113"
+    def anonlib_version = "00.21.026"
+    def bouncycastle_version = "01.65.002"
 
     debugImplementation("anon:ANONVPNlib:${anonvpnlib_version}-SNAPSHOT:android") {
         changing = true
@@ -96,11 +127,14 @@ dependencies {
     debugImplementation 'anon:SkypeForANON:0.0.9-SNAPSHOT:android'
     releaseImplementation "anon:BouncyCastleLightForAN.ON:${bouncycastle_version}-SNAPSHOT:android"
     releaseImplementation 'anon:SkypeForANON:0.0.9-SNAPSHOT:android'
-    implementation 'com.google.code.gson:gson:2.8.1'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
+    tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked"
     }
+
+    withRemotePCAPImplementation 'org.apache.sshd:sshd-core:2.6.0'
+    withRemotePCAPImplementation 'org.slf4j:slf4j-simple:1.7.30'
+    withRemotePCAPImplementation 'org.apache.mina:mina-core:2.1.4'
+
 }
 
 
-- 
GitLab