Merge branch 'upstream'

Author: sheldonrobinson

src/serious_python/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.9.8
+
+* Fix logging on Android.
+
+## 0.9.7
+
+* Fix app restart on Android 10.
+* Redirect Python output to logcat.
+
+## 0.9.6
+
+* Make zipDirectory call asynchronous.
+
+## 0.9.5
+
+* Bump `archive` to `^4.0.7`.
+* Fixed iOS framework identifier generation.
+
 ## 0.9.4
 
 * 16 KB memory page support for Android 15+ (by [@ReYaNOW](https://github.com/ReYaNOW)).

src/serious_python/bin/package_command.dart

@@ -557,7 +557,7 @@ class PackageCommand extends Command {
         "Creating app archive at ${dest.path} from a temp directory",
       );
       final encoder = ZipFileEncoder();
-      encoder.zipDirectory(tempDir, filename: dest.path);
+      await encoder.zipDirectory(tempDir, filename: dest.path);
 
       // create hash file
       stdout.writeln("Writing app archive hash to ${dest.path}.hash");

src/serious_python/pubspec.yaml

@@ -2,7 +2,7 @@ name: serious_python
 description: A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.9.4+1
+version: 0.9.8+1
 
 platforms:
   ios:
@@ -11,8 +11,6 @@ platforms:
   windows:
   linux:
 
-resolution: workspace
-
 environment:
   sdk: '>=3.7.0 < 4.0.0'
   flutter: '>=3.27.0'
@@ -59,4 +57,4 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   plugin_platform_interface: ^2.1.8
-  flutter_lints: ^6.0.0
+  flutter_lints: ^6.0.0

src/serious_python_android/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.9.8
+
+* Fix logging on Android.
+
+## 0.9.7
+
+* Fix app restart on Android 10.
+* Redirect Python output to logcat.
+
+## 0.9.6
+
+* Make zipDirectory call asynchronous.
+
+## 0.9.5
+
+* Bump `archive` to `^4.0.7`.
+* Fixed iOS framework identifier generation.
+
 ## 0.9.4
 
 * 16 KB memory page support for Android 15+ (by [@ReYaNOW](https://github.com/ReYaNOW)).

src/serious_python_android/android/build.gradle

@@ -1,6 +1,6 @@
 group 'com.flet.serious_python_android'
-version '0.9.4'
-
+version '0.9.8'
+    
 def python_version = '3.12'
 
 buildscript {

src/serious_python_android/lib/serious_python_android.dart

@@ -8,6 +8,7 @@ import 'package:path/path.dart' as p;
 import 'package:serious_python_platform_interface/serious_python_platform_interface.dart';
 
 import 'src/cpython.dart';
+import 'src/log.dart';
 
 /// An implementation of [SeriousPythonPlatform] that uses method channels.
 class SeriousPythonAndroid extends SeriousPythonPlatform {
@@ -33,24 +34,23 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {
       List<String>? modulePaths,
       Map<String, String>? environmentVariables,
       bool? sync}) async {
-    Future setenv(String key, String value) async {
-      await methodChannel.invokeMethod<String>(
-          'setEnvironmentVariable', {'name': key, 'value': value});
-    }
+    Future<void> setenv(String key, String value) =>
+        methodChannel.invokeMethod<String>(
+            'setEnvironmentVariable', {'name': key, 'value': value});
 
     // load libpyjni.so to get JNI reference
     try {
       await methodChannel
           .invokeMethod<String>('loadLibrary', {'libname': 'pyjni'});
       await setenv("FLET_JNI_READY", "1");
     } catch (e) {
-      debugPrint("Warning: Unable to load libpyjni.so library: $e");
+      spDebug("Unable to load libpyjni.so library: $e");
     }
 
     // unpack python bundle
     final nativeLibraryDir =
         await methodChannel.invokeMethod<String>('getNativeLibraryDir');
-    debugPrint("getNativeLibraryDir: $nativeLibraryDir");
+    spDebug("getNativeLibraryDir: $nativeLibraryDir");
 
     var bundlePath = "$nativeLibraryDir/libpythonbundle.so";
     var sitePackagesZipPath = "$nativeLibraryDir/libpythonsitepackages.so";
@@ -60,7 +60,7 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {
     }
     var pythonLibPath =
         await extractFileZip(bundlePath, targetPath: "python_bundle");
-    debugPrint("pythonLibPath: $pythonLibPath");
+    spDebug("pythonLibPath: $pythonLibPath");
 
     var programDirPath = p.dirname(appPath);
 
@@ -74,22 +74,22 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {
     if (await File(sitePackagesZipPath).exists()) {
       var sitePackagesPath = await extractFileZip(sitePackagesZipPath,
           targetPath: "python_site_packages");
-      debugPrint("sitePackagesPath: $sitePackagesPath");
+      spDebug("sitePackagesPath: $sitePackagesPath");
       moduleSearchPaths.add(sitePackagesPath);
     }
 
-    setenv("PYTHONINSPECT", "1");
-    setenv("PYTHONDONTWRITEBYTECODE", "1");
-    setenv("PYTHONNOUSERSITE", "1");
-    setenv("PYTHONUNBUFFERED", "1");
-    setenv("LC_CTYPE", "UTF-8");
-    setenv("PYTHONHOME", pythonLibPath);
-    setenv("PYTHONPATH", moduleSearchPaths.join(":"));
+    await setenv("PYTHONINSPECT", "1");
+    await setenv("PYTHONDONTWRITEBYTECODE", "1");
+    await setenv("PYTHONNOUSERSITE", "1");
+    await setenv("PYTHONUNBUFFERED", "1");
+    await setenv("LC_CTYPE", "UTF-8");
+    await setenv("PYTHONHOME", pythonLibPath);
+    await setenv("PYTHONPATH", moduleSearchPaths.join(":"));
 
     // set environment variables
     if (environmentVariables != null) {
       for (var v in environmentVariables.entries) {
-        setenv(v.key, v.value);
+        await setenv(v.key, v.value);
       }
     }