From 7f3c3fa4aaed8f93eb8cea43a943985820c6e81a Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Fri, 8 May 2026 22:13:13 -0700 Subject: [PATCH 1/3] fix: correct linux CMakeLists paths for epiccash/mwc .so installs --- scripts/app_config/templates/linux/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/app_config/templates/linux/CMakeLists.txt b/scripts/app_config/templates/linux/CMakeLists.txt index 675a23f25..d1c69c17f 100644 --- a/scripts/app_config/templates/linux/CMakeLists.txt +++ b/scripts/app_config/templates/linux/CMakeLists.txt @@ -155,12 +155,12 @@ install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) if(INCLUDE_EPIC_SO) - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libepiccash/scripts/linux/build/rust/target/x86_64-unknown-linux-gnu/release/libepic_cash_wallet.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libepiccash/linux/bin/x86_64-unknown-linux-gnu/release/libepic_cash_wallet.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) endif() if(INCLUDE_MWC_SO) - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmwc/scripts/linux/build/rust/target/x86_64-unknown-linux-gnu/release/libmwc_wallet.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmwc/linux/bin/x86_64-unknown-linux-gnu/release/libmwc_wallet.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) endif() From 0a1eaf1c8f6a8ab6fa216a0f7fc3dbf400c8ae91 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Fri, 8 May 2026 22:18:54 -0700 Subject: [PATCH 2/3] Update openjdk in CI image --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 127bddd70..028b9e499 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ocl-icd-opencl-dev opencl-headers valac zlib1g-dev \ g++-aarch64-linux-gnu gcc-aarch64-linux-gnu \ g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \ - openjdk-17-jdk-headless \ + openjdk-21-jdk-headless \ && rm -rf /var/lib/apt/lists/* RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \ @@ -38,7 +38,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \ && cargo install cargo-ndk \ && chmod -R a+rwX "$CARGO_HOME" "$RUSTUP_HOME" -ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64 ENV ANDROID_SDK_ROOT=/opt/android-sdk \ ANDROID_HOME=/opt/android-sdk \ From 71f3628a771561c7c928a2d840af207956fe360d Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Sun, 10 May 2026 17:42:49 -0700 Subject: [PATCH 3/3] Don't build windows FFI libmwebd.dll --- .github/workflows/build.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f2f2a488c..892dc88ac 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -239,6 +239,23 @@ jobs: - name: Get dependencies run: flutter pub get + # Stack Wallet uses mwebd.exe as a subprocess on Windows, not the FFI + # DLL, so we don't need libmwebd.dll. The upstream plugin's Windows + # build path requires WSL, which the GitHub runner lacks. + - name: Patch flutter_mwebd to skip Windows FFI build (CI workaround) + run: | + set -euo pipefail + cache_root="$(cygpath -u "$LOCALAPPDATA")/Pub/Cache/hosted/pub.dev" + plugin_dir=$(find "$cache_root" -maxdepth 1 -type d -name 'flutter_mwebd-*' -print -quit) + if [ -z "$plugin_dir" ] || [ ! -f "$plugin_dir/pubspec.yaml" ]; then + echo "::error::Could not locate flutter_mwebd in $cache_root" + exit 1 + fi + pubspec="$plugin_dir/pubspec.yaml" + echo "Patching $pubspec" + sed -i '/^ windows:$/,/^ ffiPlugin: true$/d' "$pubspec" + flutter pub get + - name: Create git_versions.dart stubs run: | mkdir -p crypto_plugins/flutter_libepiccash/lib