diff --git a/docker-compose.yml b/docker-compose.yml index 055a28a..b42a344 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -242,6 +242,7 @@ services: VITE_FRONTEND_URL: ${PUBLIC_FRONTEND_URL:-http://localhost:3002} PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} PUBLIC_FRONTEND_URL: ${PUBLIC_FRONTEND_URL:-http://localhost:3002} + ANDROID_GRADLE_PLUGIN_VERSION: ${ANDROID_GRADLE_PLUGIN_VERSION:-8.11.1} volumes: - ./apps/frontend/public/downloads:/out diff --git a/tauri_app/docker/build-android-apk.sh b/tauri_app/docker/build-android-apk.sh index e8fb987..5a7d3f8 100644 --- a/tauri_app/docker/build-android-apk.sh +++ b/tauri_app/docker/build-android-apk.sh @@ -7,6 +7,7 @@ export VITE_API_URL="${VITE_API_URL:-${PUBLIC_API_URL:-http://localhost:3000}}" export VITE_FRONTEND_URL="${VITE_FRONTEND_URL:-${PUBLIC_FRONTEND_URL:-http://localhost:3002}}" export ANDROID_HOME="${ANDROID_HOME:-/opt/android-sdk}" export ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-${ANDROID_HOME}}" +export ANDROID_GRADLE_PLUGIN_VERSION="${ANDROID_GRADLE_PLUGIN_VERSION:-8.11.1}" if [ -z "${ANDROID_NDK_HOME:-}" ]; then NDK_DIR="$(find "${ANDROID_HOME}/ndk" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort -V | tail -n 1 || true)" @@ -36,6 +37,16 @@ if [ ! -d "src-tauri/gen/android" ]; then npm run android:init -- --ci || npm run android:init fi +echo "==> Проверка Android Gradle Plugin" +if grep -R "com.android.tools.build:gradle:8.11.0\\|8.11.0" -n src-tauri/gen/android >/tmp/agp-8-11-0.txt 2>/dev/null; then + echo "Tauri сгенерировал Android Gradle Plugin 8.11.0, которого нет в Google Maven. Патчим на ${ANDROID_GRADLE_PLUGIN_VERSION}." + find src-tauri/gen/android \ + -type f \ + \( -name '*.gradle' -o -name '*.gradle.kts' -o -name '*.toml' -o -name 'libs.versions.toml' \) \ + -print0 \ + | xargs -0 sed -i "s/8\\.11\\.0/${ANDROID_GRADLE_PLUGIN_VERSION}/g" +fi + echo "==> Сборка Android APK" npm run tauri -- android build --apk