diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 5e596da54..1ac5989e6 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -334,6 +334,7 @@ android {
     packagingOptions {
         jniLibs {
             excludes += ['/fabric/**', '/META-INF/native-image/**']
+            useLegacyPackaging true
         }
         resources {
             excludes += ['/fabric/**', '/META-INF/*.version', '/META-INF/*.kotlin_module', '/META-INF/native-image/**', '/builddef.lst', '/*.txt', '/DebugProbesKt.bin', '/okhttp3/internal/publicsuffix/NOTICE']
diff --git a/TMessagesProj/proguard-rules.pro b/TMessagesProj/proguard-rules.pro
index ac99c70df..794697f3d 100644
--- a/TMessagesProj/proguard-rules.pro
+++ b/TMessagesProj/proguard-rules.pro
@@ -152,3 +152,11 @@
 -dontwarn org.osmdroid.**
 
 -keepattributes SourceFile,LineNumberTable
+
+-dontwarn java.beans.**
+-dontwarn java.lang.management.**
+-dontwarn javax.swing.**
+-dontwarn lombok.**
+-dontwarn org.slf4j.**
+-dontwarn org.w3c.dom.bootstrap.**
+-dontwarn sun.net.spi.nameservice.**
diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
index 8a0c901d8..8a2e9a615 100644
--- a/TMessagesProj/src/main/AndroidManifest.xml
+++ b/TMessagesProj/src/main/AndroidManifest.xml
@@ -128,7 +128,6 @@
         android:allowBackup="true"
         android:restoreAnyVersion="true"
         android:backupAgent=".BackupAgent"
-        android:extractNativeLibs="true"
         android:hardwareAccelerated="@bool/useHardwareAcceleration"
         android:icon="@mipmap/ic_launcher_nagram"
         android:label="@string/NekoX"
diff --git a/build.gradle b/build.gradle
index bd630f54c..60b772892 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
diff --git a/gradle.properties b/gradle.properties
index f3157e54b..2981f1d93 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,3 +21,7 @@ org.gradle.parallel=true
 org.gradle.configureondemand=false
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8.fullMode=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 47825044a..c583a7024 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 17 16:55:16 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
index 0e724ad1c..011c25303 100644
--- a/openpgp-api/build.gradle
+++ b/openpgp-api/build.gradle
@@ -14,4 +14,7 @@ android {
         abortOnError false
     }
     namespace 'org.openintents.openpgp'
+    buildFeatures {
+        aidl true
+    }
 }
\ No newline at end of file