diff --git a/.env.example b/.env.example index 54a17b5..03a3f08 100644 --- a/.env.example +++ b/.env.example @@ -2,4 +2,6 @@ FLUTTER_VERSION=3.7.7 FASTLANE_VERSION=2.213.0 ANDROID_BUILD_TOOLS_VERSION=30.0.3 ANDROID_PLATFORM_VERSIONS=28 31 33 -ENABLE_ANALYTICS=true \ No newline at end of file +ENABLE_ANALYTICS=true +ANDROID_NDK_VERSION=26.3.11579264 +CMAKE_VERSION=3.22.1 diff --git a/android.Dockerfile b/android.Dockerfile index beff5b6..c685755 100644 --- a/android.Dockerfile +++ b/android.Dockerfile @@ -1,11 +1,11 @@ -FROM debian:12.9-slim@sha256:12c396bd585df7ec21d5679bb6a83d4878bc4415ce926c9e5ea6426d23c60bdc AS flutter +FROM debian:12.10-slim@sha256:1209d8fd77def86ceb6663deef7956481cc6c14a25e1e64daec12c0ceffcc19d AS flutter SHELL ["/bin/bash", "-euxo", "pipefail", "-c"] ENV LANG=C.UTF-8 # renovate: release=bullseye depName=curl -ARG CURL_VERSION="7.88.1-10+deb12u8" +ARG CURL_VERSION="7.88.1-10+deb12u12" # renovate: release=bullseye depName=git ARG GIT_VERSION="1:2.39.5-0+deb12u2" # renovate: release=bullseye depName=lcov diff --git a/config/version.json b/config/version.json index 90a56c0..32dcad9 100644 --- a/config/version.json +++ b/config/version.json @@ -17,7 +17,7 @@ "version": "34.0.0" }, "cmdlineTools": { - "version": "12.0" + "version": "19.0" }, "ndk": { "version": "26.3.11579264" diff --git a/docker-compose.yml b/docker-compose.yml index e2fa10e..b8f4627 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ services: flutter: build: + dockerfile: ./android.Dockerfile target: flutter args: flutter_version: $FLUTTER_VERSION @@ -18,6 +19,7 @@ services: android: build: + dockerfile: ./android.Dockerfile target: android args: flutter_version: $FLUTTER_VERSION diff --git a/test/android.yml b/test/android.yml index 06b600a..2a32ba0 100644 --- a/test/android.yml +++ b/test/android.yml @@ -84,12 +84,12 @@ commandTests: excludedOutput: - Sending anonymous analytics information fileContentTests: - - name: Android SDK Command-line Tools is version 12.0 + - name: Android SDK Command-line Tools is version 19.0 path: /home/flutter/sdks/android-sdk/cmdline-tools/latest/source.properties expectedContents: - |- - Pkg.Revision=12.0 - Pkg.Path=cmdline-tools;12.0 + Pkg.Revision=19.0 + Pkg.Path=cmdline-tools;19.0 Pkg.Desc=Android SDK Command-line Tools - name: Dart and Flutter analytics are disabled path: /home/flutter/.dart-tool/dart-flutter-telemetry.config