From b962d303c5a991c640f6decf193583f50313fa4d Mon Sep 17 00:00:00 2001
From: "anthony@rabine.fr" <Anthony>
Date: Mon, 23 Jun 2025 15:18:05 +0200
Subject: [PATCH] fix Flutter build

---
 .gitignore                                    |  1 +
 story-player/android/app/build.gradle         |  3 ++-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 story-player/android/settings.gradle          |  4 ++--
 story-player/lib/main.dart                    |  2 +-
 story-player/pubspec.yaml                     | 19 +++++++++----------
 story-player/storyvm/CMakeLists.txt           |  4 ++--
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1bfcce6..dc3ac52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,4 @@ story-editor/flatpak_build/
 story-editor/AppDir/
 
 core/story-manager/tests/build
+story-player/android/build/reports/problems/problems-report.html
diff --git a/story-player/android/app/build.gradle b/story-player/android/app/build.gradle
index cc53734..e11b22e 100644
--- a/story-player/android/app/build.gradle
+++ b/story-player/android/app/build.gradle
@@ -26,7 +26,8 @@ if (flutterVersionName == null) {
 android {
     namespace "org.openstoryteller.story_player"
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    // ndkVersion flutter.ndkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/story-player/android/gradle/wrapper/gradle-wrapper.properties b/story-player/android/gradle/wrapper/gradle-wrapper.properties
index dcf0f19..efdcc4a 100644
--- a/story-player/android/gradle/wrapper/gradle-wrapper.properties
+++ b/story-player/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
diff --git a/story-player/android/settings.gradle b/story-player/android/settings.gradle
index a6efc8a..99330c1 100644
--- a/story-player/android/settings.gradle
+++ b/story-player/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.9.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.21" apply false
 }
 
 include ":app"
\ No newline at end of file
diff --git a/story-player/lib/main.dart b/story-player/lib/main.dart
index 473fc13..8ee5907 100644
--- a/story-player/lib/main.dart
+++ b/story-player/lib/main.dart
@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:saf/saf.dart';
+
 import 'package:path_provider/path_provider.dart';
 import 'package:audioplayers/audioplayers.dart';
 import 'package:file_picker/file_picker.dart';
diff --git a/story-player/pubspec.yaml b/story-player/pubspec.yaml
index cd94be5..7b886fe 100644
--- a/story-player/pubspec.yaml
+++ b/story-player/pubspec.yaml
@@ -37,20 +37,19 @@ dependencies:
   cupertino_icons: ^1.0.2
   shelf: ^1.4.1
   shelf_router: ^1.1.4
-  mime: ^1.0.4
+  mime: ^2.0.0
   path: ^1.8.3
-  path_provider: ^2.1.2
-  saf: ^1.0.3+4
+  path_provider: ^2.1.5
   ffi: ^2.1.0
   logger: ^2.2.0
-  file_picker: ^8.0.3
+  file_picker: ^10.2.0
   dqoi: ^1.3.0
-  audioplayers: ^5.2.1
+  audioplayers: ^6.5.0
   event_bus: ^2.0.0
-  external_path: ^1.0.3
-  permission_handler: ^10.4.5
-  device_info_plus: ^10.1.0
-  ffigen: ^12.0.0
+  external_path: ^2.2.0
+  permission_handler: ^12.0.0+1
+  device_info_plus: ^11.5.0
+  ffigen: ^19.0.0
   shared_preferences: ^2.2.3
 
 dev_dependencies:
@@ -62,7 +61,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^2.0.0
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/story-player/storyvm/CMakeLists.txt b/story-player/storyvm/CMakeLists.txt
index d08c54d..d8a84db 100644
--- a/story-player/storyvm/CMakeLists.txt
+++ b/story-player/storyvm/CMakeLists.txt
@@ -4,8 +4,8 @@ project(storyvm LANGUAGES CXX C)
 add_library(storyvm
   SHARED
   ./storyvm.cpp
-  ../../firmware/chip32/chip32_vm.c
+  ../../core/chip32/chip32_vm.c
 )
 
-include_directories(../../firmware/chip32 ../../shared)
+include_directories(../../core/chip32 ../../shared)