From 3a72596de2eff5530524df68979a35318b398e14 Mon Sep 17 00:00:00 2001 From: Francois Date: Mon, 17 Feb 2025 09:19:51 +0200 Subject: [PATCH 1/4] build: fix missing asset error assets declared by dependency packages appear to be accessible from the calling/parent package --- pubspec.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8e6e867f3a..57e934676f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -213,8 +213,6 @@ flutter: - assets/fiat/providers/ - assets/packages/flutter_inappwebview_web/assets/web/ - app_build/build_config.json - - packages/komodo_defi_framework/assets/config/ - - packages/komodo_defi_framework/assets/coin_icons/png/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. From 4d728e1f567d78e30f0ed1c079c282a2470e8f49 Mon Sep 17 00:00:00 2001 From: Francois Date: Mon, 17 Feb 2025 09:23:07 +0200 Subject: [PATCH 2/4] ci(flutter): upgrade pinned version to 3.29 --- .devcontainer/komodo-wallet-android-dev.dockerfile | 2 +- .docker/komodo-wallet-android.dockerfile | 2 +- .github/actions/flutter-deps/action.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/komodo-wallet-android-dev.dockerfile b/.devcontainer/komodo-wallet-android-dev.dockerfile index 6182c4a8f1..9bcef5a58b 100644 --- a/.devcontainer/komodo-wallet-android-dev.dockerfile +++ b/.devcontainer/komodo-wallet-android-dev.dockerfile @@ -2,7 +2,7 @@ FROM docker.io/ubuntu:22.04 ARG KDF_BRANCH=main ENV KDF_DIR=/kdf -ENV FLUTTER_VERSION="3.22.3" +ENV FLUTTER_VERSION="3.29.0" ENV FLUTTER_HOME="/home/komodo/.flutter-sdk" ENV USER="komodo" ENV USER_ID=1000 diff --git a/.docker/komodo-wallet-android.dockerfile b/.docker/komodo-wallet-android.dockerfile index 6fef3b9146..6168059cfb 100644 --- a/.docker/komodo-wallet-android.dockerfile +++ b/.docker/komodo-wallet-android.dockerfile @@ -12,7 +12,7 @@ RUN cd /app && \ FROM komodo/android-sdk:34 AS final -ENV FLUTTER_VERSION="3.22.3" +ENV FLUTTER_VERSION="3.29.0" ENV FLUTTER_HOME="/home/komodo/.flutter-sdk" ENV USER="komodo" ENV PATH=$PATH:$FLUTTER_HOME/bin diff --git a/.github/actions/flutter-deps/action.yml b/.github/actions/flutter-deps/action.yml index 331a114d3f..e23b5a84ba 100644 --- a/.github/actions/flutter-deps/action.yml +++ b/.github/actions/flutter-deps/action.yml @@ -6,7 +6,7 @@ runs: - name: Get stable flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.27.x" + flutter-version: "3.29.x" channel: "stable" - name: Prepare build directory From 8c5097823817fc89a2bc85dadac80150f9590ce4 Mon Sep 17 00:00:00 2001 From: Francois Date: Mon, 17 Feb 2025 09:25:55 +0200 Subject: [PATCH 3/4] docs: upgrade pinned flutter version to 3.29 --- docs/FLUTTER_VERSION.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/FLUTTER_VERSION.md b/docs/FLUTTER_VERSION.md index dd84b43b4a..d2b300cd60 100644 --- a/docs/FLUTTER_VERSION.md +++ b/docs/FLUTTER_VERSION.md @@ -4,13 +4,13 @@ This project aims to keep the Flutter version up-to-date with the latest stable ## Current version -3.22.3 +3.29.0 ## Pin Flutter version ``` cd ~/flutter -git checkout 3.22.3 +git checkout 3.29.0 flutter doctor ``` From f7363e6af9d95d68d3d3a45f2b1d2aecf4759869 Mon Sep 17 00:00:00 2001 From: Francois Date: Mon, 17 Feb 2025 09:27:58 +0200 Subject: [PATCH 4/4] build(android): upgrade NDK version to v27 (latest stable) --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1e462667fe..397c4120d7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -55,7 +55,7 @@ android { abiFilters 'armeabi-v7a', 'arm64-v8a' } } - ndkVersion '26.3.11579264' + ndkVersion '27.2.12479018' buildTypes { release {