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.29.2"
ENV FLUTTER_VERSION="3.32.0"
ENV USER="komodo"
ENV USER_ID=1000
ENV PATH=$PATH:/opt/flutter/bin
Expand Down
2 changes: 1 addition & 1 deletion .docker/komodo-wallet-android.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM komodo/android-sdk:35 AS final

ENV FLUTTER_VERSION="3.29.2"
ENV FLUTTER_VERSION="3.32.0"
ENV HOME="/home/komodo"
ENV USER="komodo"
ENV PATH=$PATH:$HOME/flutter/bin
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.29.2"
flutter-version: "3.32.0"
channel: "stable"

- name: Prepare build directory
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/mobile-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ jobs:
FEEDBACK_PRODUCTION_URL: ${{ secrets.FEEDBACK_PRODUCTION_URL }}
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.
# https://github.com/flutter/flutter/issues/169336
- name: Temporary workaround for Android build issue
if: ${{ matrix.platform == 'Android' }}
run: |
flutter build apk --config-only

- name: Build for ${{ matrix.platform }}
env:
GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
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.29.2"
flutter-version: "3.32.0"
channel: "stable"

- name: Determine configuration
Expand Down
6 changes: 3 additions & 3 deletions app_theme/lib/src/dark/theme_global_dark.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ ThemeData get themeGlobalDark {
fontFamily: 'Manrope',
scaffoldBackgroundColor: colorScheme.onSurface,
cardColor: colorScheme.surface,
cardTheme: CardTheme(
cardTheme: CardThemeData(
color: colorScheme.surface,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(18)),
Expand All @@ -83,7 +83,7 @@ ThemeData get themeGlobalDark {
iconTheme: IconThemeData(color: colorScheme.primary),
progressIndicatorTheme:
ProgressIndicatorThemeData(color: colorScheme.primary),
dialogTheme: const DialogTheme(
dialogTheme: const DialogThemeData(
backgroundColor: Color.fromRGBO(14, 16, 27, 1),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Expand Down Expand Up @@ -144,7 +144,7 @@ ThemeData get themeGlobalDark {
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
),
),
tabBarTheme: TabBarTheme(
tabBarTheme: TabBarThemeData(
labelColor: textColor,
indicator: UnderlineTabIndicator(
borderSide: BorderSide(
Expand Down
6 changes: 3 additions & 3 deletions app_theme/lib/src/light/theme_global_light.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ThemeData get themeGlobalLight {
fontFamily: 'Manrope',
scaffoldBackgroundColor: colorScheme.onSurface,
cardColor: colorScheme.surface,
cardTheme: CardTheme(
cardTheme: CardThemeData(
color: colorScheme.surface,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(18)),
Expand All @@ -67,7 +67,7 @@ ThemeData get themeGlobalLight {
iconTheme: IconThemeData(color: colorScheme.primary),
progressIndicatorTheme:
ProgressIndicatorThemeData(color: colorScheme.primary),
dialogTheme: const DialogTheme(
dialogTheme: const DialogThemeData(
backgroundColor: Color.fromRGBO(255, 255, 255, 1),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Expand Down Expand Up @@ -152,7 +152,7 @@ ThemeData get themeGlobalLight {
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
),
),
tabBarTheme: TabBarTheme(
tabBarTheme: TabBarThemeData(
labelColor: textColor,
indicator: UnderlineTabIndicator(
borderSide: BorderSide(
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.29.2` (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.0` (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.29.2
- Known issues with `flutter pub get` when using Flutter 3.32.0
- Difficulty switching between versions for different projects

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

```bash
cd ~/flutter
git checkout 3.29.2
git checkout 3.32.0
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.29.2`
3. Click on "Versions" in the sidebar and download Flutter version `3.32.0`

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.29.2:
2. Install and use Flutter 3.32.0:

```bash
fvm install 3.29.2
fvm global 3.29.2
fvm install 3.32.0
fvm global 3.32.0
```

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.29.2:
3. Install and use Flutter 3.32.0:

```powershell
fvm install 3.29.2
fvm global 3.29.2
fvm install 3.32.0
fvm global 3.32.0
```

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.29.2
fvm use 3.32.0
```

This will create a `.fvmrc` file in your project, which specifies the Flutter version to use for this project.
Expand Down
32 changes: 32 additions & 0 deletions ios/Flutter/ephemeral/flutter_lldb_helper.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# Generated file, do not edit.
#

import lldb

def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
"""Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
base = frame.register["x0"].GetValueAsAddress()
page_len = frame.register["x1"].GetValueAsUnsigned()

# Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
# first page to see if handled it correctly. This makes diagnosing
# misconfiguration (e.g. missing breakpoint) easier.
data = bytearray(page_len)
data[0:8] = b'IHELPED!'

error = lldb.SBError()
frame.GetThread().GetProcess().WriteMemory(base, data, error)
if not error.Success():
print(f'Failed to write into {base}[+{page_len}]', error)
return

def __lldb_init_module(debugger: lldb.SBDebugger, _):
target = debugger.GetDummyTarget()
# Caveat: must use BreakpointCreateByRegEx here and not
# BreakpointCreateByName. For some reasons callback function does not
# get carried over from dummy target for the later.
bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
bp.SetAutoContinue(True)
print("-- LLDB integration loaded --")
5 changes: 5 additions & 0 deletions ios/Flutter/ephemeral/flutter_lldbinit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Generated file, do not edit.
#

command script import --relative-to-command-file flutter_lldb_helper.py
8 changes: 0 additions & 8 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
Expand Down Expand Up @@ -308,14 +304,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
Expand Down
2 changes: 2 additions & 0 deletions ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -43,6 +44,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ SPEC CHECKSUMS:
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
komodo_defi_framework: c01710e1bf0eaa1fad46b3e4ba596f24dba394fd
komodo_defi_framework: 263b99ca54a5e732a6593938d0a88e31c30a7f81
local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
mobile_scanner: 07710d6b9b2c220ae899de2d7ecf5d77ffa56333
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
Expand Down
22 changes: 11 additions & 11 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ packages:
dependency: transitive
description:
name: async
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
url: "https://pub.dev"
source: hosted
version: "2.12.0"
version: "2.13.0"
badges:
dependency: "direct main"
description:
Expand Down Expand Up @@ -228,10 +228,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.3.3"
feedback:
dependency: "direct main"
description:
Expand Down Expand Up @@ -742,10 +742,10 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
url: "https://pub.dev"
source: hosted
version: "10.0.8"
version: "10.0.9"
leak_tracker_flutter_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -1459,10 +1459,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
url: "https://pub.dev"
source: hosted
version: "14.3.1"
version: "15.0.0"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -1499,10 +1499,10 @@ packages:
dependency: transitive
description:
name: webdriver
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
url: "https://pub.dev"
source: hosted
version: "3.0.4"
version: "3.1.0"
webkit_inspection_protocol:
dependency: transitive
description:
Expand Down Expand Up @@ -1554,4 +1554,4 @@ packages:
version: "3.1.3"
sdks:
dart: ">=3.7.0 <4.0.0"
flutter: ">=3.29.2"
flutter: ">=3.32.0"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ environment:
# the new formatting style may cause conflicts. This allows to run 3.7.0, but it will not
# enforce the new formatting style until the mininum Dart version is updated.
sdk: ">=3.6.0 <4.0.0"
flutter: ^3.29.2
flutter: ^3.32.0

dependencies:
## ---- Flutter SDK
Expand Down
Loading