Merge remote-tracking branch 'upstream/dev' into dev

.github/workflows/debug.yml

@@ -389,7 +389,9 @@ jobs:
       - build
       - telegram-bot-api
     steps:
-      - name: Download Artifacts
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Donwload Artifacts
         uses: actions/download-artifact@v4
         with:
           path: artifacts

.github/workflows/pr.yml

@@ -369,7 +369,7 @@ jobs:
           APK=$(find TMessagesProj/build/outputs/apk -name '*arm64-v8a*.apk')
           APK=$(dirname $APK)
           echo "APK=$APK" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: Debug
           path: ${{ env.APK }}

.github/workflows/release.yml

@@ -372,7 +372,7 @@ jobs:
           APK=$(find TMessagesProj/build/outputs/apk -name '*arm64-v8a*.apk')
           APK=$(dirname $APK)
           echo "APK=$APK" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.flavor }}
           path: ${{ env.APK }}
@@ -384,8 +384,10 @@ jobs:
       - build
       - telegram-bot-api
     steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Donwload Artifacts
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Download Telegram Bot API Binary

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "TMessagesProj/jni/libwebp"]
-	path = TMessagesProj/jni/libwebp
-	url = https://github.com/webmproject/libwebp
 [submodule "TMessagesProj/jni/boringssl"]
 	path = TMessagesProj/jni/boringssl
 	url = https://github.com/google/boringssl

TMessagesProj/build.gradle

@@ -14,12 +14,12 @@ repositories {
     }
 }
 
-def verName = "11.0.0"
-def verCode = 1191
+def verName = APP_VERSION_NAME
+def verCode = 1194
 
 
-def officialVer = "11.0.0"
-def officialCode = 5143
+def officialVer = APP_VERSION_NAME
+def officialCode = APP_VERSION_CODE
 
 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
 
@@ -83,7 +83,7 @@ def nativeTarget = System.getenv("NATIVE_TARGET")
 if (nativeTarget == null) nativeTarget = ""
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig.applicationId = "xyz.nextalone.nagram"
@@ -111,7 +111,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         versionName verName
         versionCode verCode
@@ -296,7 +296,7 @@ dependencies {
     //noinspection GradleDependency
     implementation "com.googlecode.mp4parser:isoparser:1.0.6"
 
-    implementation "com.google.code.gson:gson:2.10"
+    implementation "com.google.code.gson:gson:2.11.0"
     implementation "org.osmdroid:osmdroid-android:6.1.10"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
@@ -352,8 +352,6 @@ dependencies {
     implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3'
     // add splash screen
     implementation("androidx.core:core-splashscreen:1.0.1")
-    // add for music tag flac...
-    implementation 'org:jaudiotagger:2.0.3'
     // add for auto translate
     implementation 'com.google.mlkit:language-id:17.0.5'
     // add for emoji