From 420fd5c36ed95fd116b5cb13af7bd9cd2a572791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eligio=20Mari=C3=B1o?= <22875166+gmeligio@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:32:56 +0100 Subject: [PATCH] chore: update flutter dependencies in version.json for 3.19.0 (#163) Co-authored-by: gmeligio --- config/version.json | 9 ++++++--- readme.md | 24 ++++++++++++------------ script/docker_build_android.sh | 4 +++- script/set_environment_variables.sh | 2 +- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/config/version.json b/config/version.json index 87146ad..3e9f137 100644 --- a/config/version.json +++ b/config/version.json @@ -1,17 +1,20 @@ { "flutter": { "channel": "stable", - "commit": "41456452f29d64e8deb623a3c927524bcf9f111b", - "version": "3.16.9" + "commit": "bae5e49bc2a867403c43b2aae2de8f8c33b037e4", + "version": "3.19.0" }, "android": { "platforms": [ { "version": 33 + }, + { + "version": 34 } ], "gradle": { - "version": "7.5" + "version": "7.6.3" }, "buildTools": { "version": "30.0.3" diff --git a/readme.md b/readme.md index a26de6a..5934414 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ The images includes the minimum tools to run Flutter and build apps. The version Features: -1. \[x\] Installed Flutter SDK 3.16.9 +1. \[x\] Installed Flutter SDK 3.19.0 2. \[x\] Analytics disabled by default, opt-in if `ENABLE_ANALYTICS` environment variable is passed when running the container. 3. \[x\] Rootless user `flutter:flutter`, with permissions to run on GitLab CI. 4. \[x\] Cached Fastlane gem 2.219.0 @@ -30,8 +30,8 @@ The images are experimental and are in active development. They are being used f Predownloaded SDKs and tools: * Licenses accepted -* Android SDK Platforms: 33 -* Gradle: 7.5 +* Android SDK Platforms: 33, 34 +* Gradle: 7.6.3 Registries: @@ -50,13 +50,13 @@ On the terminal: ```bash # From Docker Hub -docker run --rm -it gmeligio/flutter-android:3.16.9 bash +docker run --rm -it gmeligio/flutter-android:3.19.0 bash # From GitHub Container Registry -docker run --rm -it ghcr.io/gmeligio/flutter-android:3.16.9 bash +docker run --rm -it ghcr.io/gmeligio/flutter-android:3.19.0 bash # From Quay.io -docker run --rm -it quay.io/gmeligio/flutter-android:3.16.9 bash +docker run --rm -it quay.io/gmeligio/flutter-android:3.19.0 bash ``` On a workflow in GitHub Actions: @@ -66,7 +66,7 @@ jobs: build: runs-on: ubuntu-22.04 container: - image: ghcr.io/gmeligio/flutter-android:3.16.9 + image: ghcr.io/gmeligio/flutter-android:3.19.0 steps: - name: Checkout uses: actions/checkout@v2 @@ -78,7 +78,7 @@ On a `.gitlab-ci.yml` in GitLab CI: ```yaml build: - image: ghcr.io/gmeligio/flutter-android:3.16.9 + image: ghcr.io/gmeligio/flutter-android:3.19.0 script: - flutter build apk ``` @@ -101,8 +101,8 @@ There is no `latest` Docker tag on purpose. You need to specify the version of t The tag is composed of the Flutter version used to build the image. For example: -* Docker image: gmeligio/flutter-android:3.16.9 -* Flutter version: 3.16.9 +* Docker image: gmeligio/flutter-android:3.19.0 +* Flutter version: 3.19.0 ## Developing locally @@ -110,13 +110,13 @@ The tag is composed of the Flutter version used to build the image. For example: The Dockerfile expects a few parameters: -* `flutter_version `: The version of Flutter to use when building. Example: 3.16.9 +* `flutter_version `: The version of Flutter to use when building. Example: 3.19.0 * `android_build_tools_version `: The version of the Android SDK Build Tools to install. Example: 30.0.3 * `android_platform_versions `: The versions of the Android SDK Platforms to install, separated by spaces. Example: 28 31 33 ```bash # Android -docker build --target android --build-arg flutter_version=3.16.9 --build-arg fastlane_version=2.219.0 --build-arg android_build_tools_version=30.0.3 --build-arg android_platform_versions="33" -t android-test . +docker build --target android --build-arg flutter_version=3.19.0 --build-arg fastlane_version=2.219.0 --build-arg android_build_tools_version=30.0.3 --build-arg android_platform_versions="33, 34" -t android-test . ``` ### Dockerfile stages diff --git a/script/docker_build_android.sh b/script/docker_build_android.sh index af89370..e3e1b7e 100644 --- a/script/docker_build_android.sh +++ b/script/docker_build_android.sh @@ -1 +1,3 @@ -docker build --target android --build-arg flutter_version=3.7.4 android_build_tools_version=30.0.3 --build-arg android_platform_versions="28 31 33" -t android-test . +#!/usr/bin/env bash + +docker build --target android --build-arg flutter_version=3.19.0 --build-arg android_build_tools_version=30.0.3 --build-arg android_platform_versions="28 31 33 34" --build-arg fastlane_version=2.219.0 -t android-test . diff --git a/script/set_environment_variables.sh b/script/set_environment_variables.sh index 239daab..3058e4c 100755 --- a/script/set_environment_variables.sh +++ b/script/set_environment_variables.sh @@ -8,7 +8,7 @@ CACHE_REPOSITORY_PATH="ghcr.io/$IMAGE_REPOSITORY_PATH" echo "FASTLANE_VERSION=$(jq -r '.fastlane.version' "$VERSION_MANIFEST")" - echo "ANDROID_PLATFORM_VERSIONS=$(jq -r '.android.platforms[].version' "$VERSION_MANIFEST")" + echo "ANDROID_PLATFORM_VERSIONS=$(jq -r '.android.platforms[].version' "$VERSION_MANIFEST" | tr '\n' ' ' | sed 's/ $//')" echo "IMAGE_REPOSITORY_PATH=$IMAGE_REPOSITORY_PATH"