adb: reduce and harden wireless transport

1 files changed, 11 insertions, 39 deletions

diff --git a/vendor/libadb-android/libadb/build.gradle b/vendor/libadb-android/libadb/build.gradle
index 33a9b9f..e20deaf 100644
--- a/vendor/libadb-android/libadb/build.gradle
+++ b/vendor/libadb-android/libadb/build.gradle
@@ -2,58 +2,30 @@
 
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
 }
 
-group = 'io.github.muntashirakon'
-version = '3.1.1'
-
 android {
-    compileSdk 35
-    namespace "io.github.muntashirakon.adb"
+    compileSdk 36
+    namespace = "io.github.muntashirakon.adb"
 
     defaultConfig {
-        minSdk 1
-        targetSdk 35
-        aarMetadata {
-            minCompileSdk = 1
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
+        minSdk 31
+        targetSdk 36
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-            withJavadocJar()
-        }
-    }
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            artifactId = 'libadb'
-            afterEvaluate {
-                from components.release
-            }
-        }
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
 dependencies {
-    implementation "androidx.annotation:annotation:1.9.1"
+    compileOnly "androidx.annotation:annotation:1.9.1"
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.84'
-    implementation 'com.github.MuntashirAkon.spake2-java:spake2-android:2.2.1'
+    implementation 'org.conscrypt:conscrypt-android:2.6.1'
+    implementation('com.github.MuntashirAkon.spake2-java:spake2-android:2.2.1') {
+        exclude group: 'androidx.annotation', module: 'annotation'
+    }
 
     testImplementation 'junit:junit:4.13.2'
 }