Update libadb to 3.0.0

Signed-off-by: Muntashir Al-Islam <[email protected]>
MuntashirAkon · Apr 18, 2024 · 39b569e · 39b569e
1 parent 5b8dfbf
commit 39b569e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -123,13 +123,6 @@ dependencies {
     implementation "com.github.MuntashirAkon:sun-security-android:${sun_security_version}"
     implementation "org.bouncycastle:bcprov-jdk15to18:${bouncycastle_version}"
     implementation "org.bouncycastle:bcpkix-jdk15to18:${bouncycastle_version}"
-    // Remove *-jdk15on libs
-    configurations {
-        configureEach {
-            exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
-            exclude group: 'org.bouncycastle', module: 'bcpkix-jdk15on'
-        }
-    }
     implementation "org.smali:baksmali:${baksmali_version}"
     implementation "org.smali:smali:${baksmali_version}"
     implementation "com.github.MuntashirAkon.jadx:jadx-core:${jadx_version}"

diff --git a/libcore/ui/src/main/java/io/github/muntashirakon/widget/SearchView.java b/libcore/ui/src/main/java/io/github/muntashirakon/widget/SearchView.java
@@ -30,6 +30,7 @@
 public class SearchView extends androidx.appcompat.widget.SearchView implements Shapeable {
     private static final int DEF_STYLE_RES = R.style.Widget_AppTheme_SearchView;
 
+    @SuppressLint("RestrictedApi")
     private final SearchAutoComplete mSearchSrcTextView;
     private final LinearLayout mSearchEditFrame;
     private final ImageView mCloseButton;

diff --git a/server/build.gradle b/server/build.gradle
@@ -23,12 +23,14 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    libraryVariants.configureEach { variant ->
-        variant.assembleProvider.configure() { task ->
-            task.doLast {
-                makeJars(variant.buildType.name)
+    libraryVariants.configureEach {variant ->
+        String buildType = variant.buildType.name
+        def jarTask = tasks.register("create${buildType.capitalize()}ServerJars") {
+            doLast {
+                makeJars(buildType)
             }
         }
+        javaCompileProvider.get().finalizedBy(jarTask)
     }
 }
 

diff --git a/versions.gradle b/versions.gradle
@@ -25,7 +25,7 @@ ext {
     hiddenapibypass_version = "4.3"
     jadx_version = "1.4.7"
     jb_annotation_version = "24.1.0" // Compile-only
-    libadb_version = "d88ca786bb"
+    libadb_version = "3.0.0"
     libsu_version = "5.2.2"
     material_version = "1.11.0"
     preferences_version = "1.2.1"