chore: Update AGP

TMessagesProj/build.gradle

@@ -125,6 +125,9 @@ android {
                 arguments "-DANDROID_STL=c++_static", "-DANDROID_PLATFORM=android-21"
             }
         }
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+        }
     }
 
     bundle {
@@ -220,15 +223,13 @@ android {
     sourceSets {
 
         main {
-            jni.srcDirs = []
             assets.srcDirs = ["src/main/assets", "src/emojis/twitter"]
         }
 
         debug {
             java {
                 srcDirs "src/main/java", "src/gservcies/java"
             }
-            jni.srcDirs = []
             jniLibs {
                 srcDir "src/main/libs"
             }
@@ -238,7 +239,6 @@ android {
         }
 
         releaseNoGcm {
-            jni.srcDirs = []
             jniLibs {
                 srcDir "src/main/libs"
             }
@@ -248,7 +248,6 @@ android {
             java {
                 srcDirs "src/main/java", "src/gservcies/java"
             }
-            jni.srcDirs = []
             jniLibs {
                 srcDir "src/main/libs"
             }
@@ -257,16 +256,8 @@ android {
             }
         }
 
-        foss {
-            jni {
-                srcDirs = ["./jni/"]
-            }
-        }
 
         fdroidRelease {
-            jni {
-                srcDirs = ["./jni/"]
-            }
             jniLibs.srcDirs = []
         }
 
@@ -305,15 +296,15 @@ android {
 
 }
 
-def fcmVersion = "23.0.7"
-def crashlyticsVersion = "18.2.12"
+def fcmVersion = "23.4.1"
+def crashlyticsVersion = "18.6.2"
 def playCoreVersion = "1.10.3"
 
 dependencies {
 
-    implementation "androidx.browser:browser:1.5.0"
+    implementation "androidx.browser:browser:1.8.0"
     implementation 'androidx.fragment:fragment:1.2.0'
-    implementation "androidx.core:core-ktx:1.9.0"
+    implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
     implementation "androidx.exifinterface:exifinterface:1.3.6"
@@ -330,10 +321,10 @@ dependencies {
     //noinspection GradleDependency
     implementation "com.googlecode.mp4parser:isoparser:1.0.6"
 
-    implementation "com.google.code.gson:gson:2.8.9"
+    implementation "com.google.code.gson:gson:2.10"
     implementation "org.osmdroid:osmdroid-android:6.1.10"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 
     implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.10"
     implementation 'com.neovisionaries:nv-websocket-client:2.14'
@@ -348,9 +339,6 @@ dependencies {
 
     implementation 'com.google.android.gms:play-services-mlkit-subject-segmentation:16.0.0-beta1'
 
-    compileOnly 'org.yaml:snakeyaml:1.29'
-    implementation 'org.yaml:snakeyaml:1.29'
-
     implementation project(":openpgp-api")
 
     compileOnly fileTree("libs")
@@ -360,10 +348,8 @@ dependencies {
     compileOnly "com.google.android.play:core:$playCoreVersion"
 
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
-    debugImplementation 'com.google.android.gms:play-services-maps:18.1.0'
-    debugImplementation 'com.google.android.gms:play-services-location:20.0.0'
-    releaseImplementation 'com.google.android.gms:play-services-maps:18.1.0'
-    releaseImplementation 'com.google.android.gms:play-services-location:20.0.0'
+    implementation 'com.google.android.gms:play-services-maps:18.2.0'
+    implementation 'com.google.android.gms:play-services-location:21.2.0'
 
     debugImplementation "com.google.firebase:firebase-messaging:$fcmVersion"
     debugImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
@@ -416,6 +402,9 @@ android {
     lint {
         disable 'MissingTranslation', 'ExtraTranslation', 'BlockedPrivateApi'
     }
+    buildFeatures {
+        buildConfig true
+    }
 
     tasks.all { task ->
         if (task.name.startsWith("uploadCrashlyticsMappingFile")) {

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'

gradle.properties

@@ -21,3 +21,5 @@ org.gradle.parallel=true
 org.gradle.configureondemand=false
 android.useAndroidX=true
 android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

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

openpgp-api/build.gradle

@@ -1,17 +1,20 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    compileSdk 33
 
     defaultConfig {
         // API-Version . minor
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
-    buildToolsVersion '31.0.0'
+    buildToolsVersion '33.0.1'
     lint {
         abortOnError false
     }
     namespace 'org.openintents.openpgp'
+    buildFeatures {
+        aidl true
+    }
 }