chore: align Build-Android APK/AAB versionCode and naming to android11+

Author: NickVs2015

.github/workflows/deploy.yml

@@ -859,19 +859,21 @@ jobs:
         QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
       shell: bash
       run: |
-        deploy/build.sh -t android --sign --aab
+        BASE_VERSION_CODE=$(grep -oP '(?<=set\(APP_ANDROID_VERSION_CODE )\d+' CMakeLists.txt)
+        VERSION_CODE=$((BASE_VERSION_CODE + 2))
+
+        APP_ANDROID_VERSION_CODE=$VERSION_CODE deploy/build.sh -t android --sign --aab
 
         VERSION=$(grep CMAKE_PROJECT_VERSION:STATIC deploy/build/CMakeCache.txt | cut -d= -f2)
 
-        (cd deploy/build/client/android-build && mv AmneziaVPN.apk AmneziaVPN_${VERSION}_android9+_universal.apk)
+        (cd deploy/build/client/android-build && mv AmneziaVPN.apk AmneziaVPN_${VERSION}_android11+_universal.apk)
 
         for abi in arm64-v8a armeabi-v7a x86 x86_64; do
-          deploy/build.sh -t android --sign --abi ${abi} --build ./deploy/build/${abi}
-          (cd deploy/build/${abi}/client/android-build && mv AmneziaVPN.apk AmneziaVPN_${VERSION}_android9+_${abi}.apk)
+          APP_ANDROID_VERSION_CODE=$VERSION_CODE deploy/build.sh -t android --sign --abi ${abi} --build ./deploy/build/${abi}
+          (cd deploy/build/${abi}/client/android-build && mv AmneziaVPN.apk AmneziaVPN_${VERSION}_android11+_${abi}.apk)
         done
 
-        BASE_VERSION_CODE=$(grep -oP '(?<=set\(APP_ANDROID_VERSION_CODE )\d+' CMakeLists.txt)
-        APP_ANDROID_MIN_SDK=30 APP_ANDROID_VERSION_CODE=$((BASE_VERSION_CODE + 2)) deploy/build.sh -t android --sign --aab --build ./deploy/build/aab
+        APP_ANDROID_MIN_SDK=30 APP_ANDROID_VERSION_CODE=$VERSION_CODE deploy/build.sh -t android --sign --aab --build ./deploy/build/aab
 
         (cd deploy/build/aab/client/android-build/build/outputs/bundle/release && mv android-build-release.aab AmneziaVPN_${VERSION}_android11+.aab)
 

CMakeLists.txt

@@ -29,7 +29,7 @@ set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 if(NOT DEFINED APP_ANDROID_VERSION_CODE)
-    set(APP_ANDROID_VERSION_CODE 2141)
+    set(APP_ANDROID_VERSION_CODE 2140)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

client/cmake/android.cmake

@@ -57,11 +57,6 @@ set_property(TARGET ${PROJECT} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${OPENVPN_P
 
 set(APP_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android)
 
-# Qt has no target property for android:maxSdkVersion, so when a max SDK is requested we
-# stage a copy of the package source dir (taken after libxray.aar and other extra libs have
-# been copied into it above) with a <uses-sdk> tag injected into the manifest; the Android
-# Gradle Plugin manifest merger combines it with the min/targetSdk it generates from
-# QT_ANDROID_MIN/TARGET_SDK_VERSION.
 if(DEFINED APP_ANDROID_MAX_SDK)
     set(APP_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/android-package-source)
     file(REMOVE_RECURSE ${APP_ANDROID_PACKAGE_SOURCE_DIR})