Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM docker.io/ubuntu:22.04

ENV FLUTTER_VERSION="3.32.0"
ENV FLUTTER_VERSION="3.32.2"
ENV USER="komodo"
ENV USER_ID=1000
ENV PATH=$PATH:/opt/flutter/bin
Expand Down
19 changes: 16 additions & 3 deletions .docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,19 @@ else
PLATFORM_FLAG=""
fi

docker build $PLATFORM_FLAG --build-arg BUILD_USER_ID=$(id -u) -f .docker/android-sdk.dockerfile . -t komodo/android-sdk:35
HOST_UID=$(id -u)
HOST_GID=$(id -g)

# Use fallback UID/GID if running as root to avoid conflicts
# in GitHub Actions where the UID/GID may be 0.
# android-sdk.dockerfile attempts to create a user with the
# provided UID/GID, so 0 is not a valid choice (already exists).
if [ "$HOST_UID" = "0" ]; then
HOST_UID=1000
HOST_GID=1000
fi

docker build $PLATFORM_FLAG --build-arg BUILD_USER_ID=$HOST_UID -f .docker/android-sdk.dockerfile . -t komodo/android-sdk:35
docker build $PLATFORM_FLAG -f .docker/komodo-wallet-android.dockerfile . -t komodo/komodo-wallet

# Create the build directory ourselves to prevent it from being created by the Docker daemon (as root)
Expand Down Expand Up @@ -52,7 +64,8 @@ done
# Use the provided arguments for flutter build
# Build a second time if needed, as asset downloads will require a rebuild on the first attempt
docker run $PLATFORM_FLAG --rm -v ./build:/app/build \
-u "$(id -u):$(id -g)" \
-v $(pwd):/app \
-u "$HOST_UID:$HOST_GID" \
$ENV_ARGS \
komodo/komodo-wallet:latest sh -c \
"sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile && flutter build $BUILD_TARGET --no-pub --$BUILD_MODE || flutter pub get --enforce-lockfile && flutter build $BUILD_TARGET --no-pub --$BUILD_MODE"
"sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; flutter build web --no-pub || true; flutter build $BUILD_TARGET --config-only; flutter build $BUILD_TARGET --no-pub --$BUILD_MODE"
3 changes: 1 addition & 2 deletions .docker/komodo-wallet-android.dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
FROM komodo/android-sdk:35 AS final

ENV FLUTTER_VERSION="3.32.0"
ENV FLUTTER_VERSION="3.32.2"
ENV HOME="/home/komodo"
ENV USER="komodo"
ENV PATH=$PATH:$HOME/flutter/bin

USER $USER

WORKDIR /app
COPY --chown=$USER:$USER . .

RUN curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz && \
tar -xvf flutter_linux_${FLUTTER_VERSION}-stable.tar.xz -C ${HOME} && \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/flutter-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
uses: subosito/flutter-action@v2
with:
# NB! Keep up-to-date with the flutter version used for development
flutter-version: "3.32.0"
flutter-version: "3.32.2"
channel: "stable"

- name: Prepare build directory
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/docker-android-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build Android Docker image

on:
pull_request:
branches:
[
dev,
main,
release/*,
hotfix/*,
bugfix/*,
feature/*,
chore/*,
build/*,
ci/*,
]
paths:
- ".docker/**"
- "android/**"
- "pubspec.yaml"
- "pubspec.lock"
workflow_dispatch:

jobs:
build-android-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

# Temporary workaround until firebase configs are added to CI
- name: Comment out Google Play Services import
shell: bash
run: |
sed -i 's/id .com\.google\.gms\.google-services./\/\/ id .com\.google\.gms\.google-services./' android/app/build.gradle
echo "Google Play Services import commented out"

- name: Build Android image
env:
GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
chmod +x .docker/build.sh
sh .docker/build.sh apk release
2 changes: 1 addition & 1 deletion .github/workflows/mobile-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
FEEDBACK_TEST_URL: ${{ secrets.FEEDBACK_TEST_URL }}

# Flutter build with `--no-pub` flag fails on Android due to a
# known regression with the build system in 3.32.0.
# known regression with the build system in 3.32.2.
# https://github.com/flutter/flutter/issues/169336
- name: Temporary workaround for Android build issue
if: ${{ matrix.platform == 'Android' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/roll-sdk-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
# NB! Keep up-to-date with the flutter version used for development
flutter-version: "3.32.0"
flutter-version: "3.32.2"
channel: "stable"

- name: Determine configuration
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ android {

compileSdk 35
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '21'
jvmTarget = '17'
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand Down
2 changes: 1 addition & 1 deletion app_theme/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ packages:
version: "2.1.4"
sdks:
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.29.2"
flutter: ">=3.32.2"
2 changes: 1 addition & 1 deletion app_theme/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 0.0.1

environment:
sdk: ">=3.6.0 <4.0.0"
flutter: ^3.29.2
flutter: ^3.32.2

dependencies:
flutter:
Expand Down
6 changes: 3 additions & 3 deletions docs/FLUTTER_VERSION.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Supported Flutter Version

This project supports Flutter `3.32.0` (latest stable release). We aim to keep the project up-to-date with the most recent stable Flutter versions.
This project supports Flutter `3.32.2` (latest stable release). We aim to keep the project up-to-date with the most recent stable Flutter versions.

## Recommended Approach: Multiple Flutter Versions

Expand All @@ -15,14 +15,14 @@ See our guide on [Multiple Flutter Versions](MULTIPLE_FLUTTER_VERSIONS.md) for d
While it's possible to pin your global Flutter installation to a specific version, **this approach is not recommended** due to:

- Lack of isolation between projects
- Known issues with `flutter pub get` when using Flutter 3.32.0
- Known issues with `flutter pub get` when using Flutter 3.32.2
- Difficulty switching between versions for different projects

If you still choose to use this method, you can run:

```bash
cd ~/flutter
git checkout 3.32.0
git checkout 3.32.2
flutter doctor
```

Expand Down
16 changes: 8 additions & 8 deletions docs/MULTIPLE_FLUTTER_VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ sudo pacman -R flutter # for Arch

2. Launch Flutter Sidekick

3. Click on "Versions" in the sidebar and download Flutter version `3.32.0`
3. Click on "Versions" in the sidebar and download Flutter version `3.32.2`

4. Set this version as the global default by clicking the "Set as Global" button

Expand Down Expand Up @@ -91,11 +91,11 @@ sudo pacman -R flutter # for Arch
curl -fsSL https://fvm.app/install.sh | bash
```

2. Install and use Flutter 3.32.0:
2. Install and use Flutter 3.32.2:

```bash
fvm install 3.32.0
fvm global 3.32.0
fvm install 3.32.2
fvm global 3.32.2
```

3. Add FVM's default Flutter version to your PATH by adding the following to your `~/.bashrc`, `~/.zshrc`, or equivalent:
Expand Down Expand Up @@ -130,11 +130,11 @@ sudo pacman -R flutter # for Arch
choco install fvm
```

3. Install and use Flutter 3.32.0:
3. Install and use Flutter 3.32.2:

```powershell
fvm install 3.32.0
fvm global 3.32.0
fvm install 3.32.2
fvm global 3.32.2
```

4. Add FVM's Flutter version to your PATH:
Expand All @@ -156,7 +156,7 @@ To use a specific Flutter version for a project:
2. Run:

```bash
fvm use 3.32.0
fvm use 3.32.2
```

This will create a `.fvmrc` file in your project, which specifies the Flutter version to use for this project.
Expand Down
8 changes: 4 additions & 4 deletions packages/komodo_ui_kit/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ packages:
description:
path: "packages/komodo_defi_rpc_methods"
ref: dev
resolved-ref: "4ecbdaba11f572aa3c46603622ad42d7ee995b1a"
resolved-ref: "27683558605b58387cf22e15fa06c29ecb62edb6"
url: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter.git"
source: git
version: "0.2.0+0"
Expand All @@ -104,7 +104,7 @@ packages:
description:
path: "packages/komodo_defi_types"
ref: dev
resolved-ref: "4ecbdaba11f572aa3c46603622ad42d7ee995b1a"
resolved-ref: "27683558605b58387cf22e15fa06c29ecb62edb6"
url: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter.git"
source: git
version: "0.2.0+0"
Expand All @@ -113,7 +113,7 @@ packages:
description:
path: "packages/komodo_ui"
ref: dev
resolved-ref: "4ecbdaba11f572aa3c46603622ad42d7ee995b1a"
resolved-ref: "27683558605b58387cf22e15fa06c29ecb62edb6"
url: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter.git"
source: git
version: "0.2.0+0"
Expand Down Expand Up @@ -196,4 +196,4 @@ packages:
version: "1.1.1"
sdks:
dart: ">=3.7.0 <4.0.0"
flutter: ">=3.29.2"
flutter: ">=3.32.2"
2 changes: 1 addition & 1 deletion packages/komodo_ui_kit/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: none

environment:
sdk: ">=3.6.0 <4.0.0"
flutter: ^3.29.2
flutter: ^3.32.2

dependencies:
flutter:
Expand Down
Loading
Loading