Fix: xcframeworks migration script didn't work for sub-directories (#131)

FeodorFitsner · web-flow · commit cc17b54f7ed7 · 2025-01-06T21:12:09.000-08:00
* Version bumped to 0.8.7, changelog updated

* Cleanup
diff --git a/src/serious_python/CHANGELOG.md b/src/serious_python/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.7
+
+* Fixed: `xcframeworks` migration script didn't work for sub-directories.
+
 ## 0.8.6
 
 * Added `com.flet.serious_python_android.PythonActivity` holder class with `mActivity` holding a reference to an app MainActivity. Needed for `plyer`.
diff --git a/src/serious_python/example/run_example/app/app.zip.hash b/src/serious_python/example/run_example/app/app.zip.hash
@@ -1 +1 @@
-eb21e6e3680f591dc1c2a20e8ef88b69cffdf67f724e3a938f8aa8a759acb036
+e23e3aa0eeaae51a8bdf828f103237a86287b3580b5ced9b7039303c402d5e95
diff --git a/src/serious_python/example/run_example/app/src/requirements.txt b/src/serious_python/example/run_example/app/src/requirements.txt
@@ -1,6 +1,7 @@
 #numpy
 lru-dict
 #pyjnius
-flet-libsodium
+#flet-libsodium
 pysodium
-#supabase
+numpy
+Pyrebase4
diff --git a/src/serious_python/example/run_example/ios/Podfile.lock b/src/serious_python/example/run_example/ios/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - serious_python_darwin (0.8.5):
+  - serious_python_darwin (0.8.6):
     - Flutter
     - FlutterMacOS
 
@@ -29,7 +29,7 @@ SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  serious_python_darwin: 190aa70fd014e151039f01cc14eefb4408eeb724
+  serious_python_darwin: c1d43899332e5f14ed1af6651ae991b371d96cf9
 
 PODFILE CHECKSUM: a57f30d18f102dd3ce366b1d62a55ecbef2158e5
 
diff --git a/src/serious_python/example/run_example/pubspec.lock b/src/serious_python/example/run_example/pubspec.lock
@@ -150,18 +150,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -190,18 +190,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: "direct main"
     description:
@@ -270,10 +270,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -397,10 +397,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   toml:
     dependency: transitive
     description:
@@ -429,10 +429,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
   web:
     dependency: transitive
     description:
diff --git a/src/serious_python/pubspec.yaml b/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.8.6
+version: 0.8.7
 
 platforms:
   ios:
diff --git a/src/serious_python_android/CHANGELOG.md b/src/serious_python_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.7
+
+* Fixed: `xcframeworks` migration script didn't work for sub-directories.
+
 ## 0.8.6
 
 * Added `com.flet.serious_python_android.PythonActivity` holder class with `mActivity` holding a reference to an app MainActivity. Needed for `plyer`.
diff --git a/src/serious_python_android/android/build.gradle b/src/serious_python_android/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.flet.serious_python_android'
-version '0.8.6'
+version '0.8.7'
 
 def python_version = '3.12'
 
diff --git a/src/serious_python_android/pubspec.yaml b/src/serious_python_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_android
 description: Android implementation of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.6
+version: 0.8.7
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_darwin/CHANGELOG.md b/src/serious_python_darwin/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.7
+
+* Fixed: `xcframeworks` migration script didn't work for sub-directories.
+
 ## 0.8.6
 
 * Added `com.flet.serious_python_android.PythonActivity` holder class with `mActivity` holding a reference to an app MainActivity. Needed for `plyer`.
diff --git a/src/serious_python_darwin/darwin/serious_python_darwin.podspec b/src/serious_python_darwin/darwin/serious_python_darwin.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'serious_python_darwin'
-  s.version          = '0.8.6'
+  s.version          = '0.8.7'
   s.summary          = 'A cross-platform plugin for adding embedded Python runtime to your Flutter apps.'
   s.description      = <<-DESC
   A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
diff --git a/src/serious_python_darwin/darwin/xcframework_utils.sh b/src/serious_python_darwin/darwin/xcframework_utils.sh
@@ -69,11 +69,11 @@ create_xcframework_from_dylibs() {
     fd=iphonesimulator/$framework.framework
     mkdir -p $fd
     lipo -create \
-        $(find "$simulator_arm64_dir" -name "$dylib_without_ext.*.$dylib_ext" -o -name "$dylib_without_ext.$dylib_ext" -type f) \
-        $(find "$simulator_x86_64_dir" -name "$dylib_without_ext.*.$dylib_ext" -o -name "$dylib_without_ext.$dylib_ext" -type f) \
+        $(find "$simulator_arm64_dir" -path "$simulator_arm64_dir/$dylib_without_ext.*.$dylib_ext" -o -path "$simulator_arm64_dir/$dylib_without_ext.$dylib_ext") \
+        $(find "$simulator_x86_64_dir" -path "$simulator_x86_64_dir/$dylib_without_ext.*.$dylib_ext" -o -path "$simulator_x86_64_dir/$dylib_without_ext.$dylib_ext") \
         -output $fd/$framework
-    find "$simulator_arm64_dir" -name "$dylib_without_ext.*.$dylib_ext" -o -name "$dylib_without_ext.$dylib_ext" -type f -delete
-    find "$simulator_x86_64_dir" -name "$dylib_without_ext.*.$dylib_ext" -o -name "$dylib_without_ext.$dylib_ext" -type f -delete
+    find "$simulator_arm64_dir" -path "$simulator_arm64_dir/$dylib_without_ext.*.$dylib_ext" -o -path "$simulator_arm64_dir/$dylib_without_ext.$dylib_ext" -delete
+    find "$simulator_x86_64_dir" -path "$simulator_x86_64_dir/$dylib_without_ext.*.$dylib_ext" -o -path "$simulator_x86_64_dir/$dylib_without_ext.$dylib_ext" -delete
     install_name_tool -id @rpath/$framework.framework/$framework $fd/$framework
     create_plist $framework "org.python.$framework_identifier" $fd/Info.plist
     echo "$origin_prefix/$dylib_without_ext.fwork" > $fd/$framework.origin
diff --git a/src/serious_python_darwin/pubspec.yaml b/src/serious_python_darwin/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_darwin
 description: iOS and macOS implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.6
+version: 0.8.7
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_linux/CHANGELOG.md b/src/serious_python_linux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.7
+
+* Fixed: `xcframeworks` migration script didn't work for sub-directories.
+
 ## 0.8.6
 
 * Added `com.flet.serious_python_android.PythonActivity` holder class with `mActivity` holding a reference to an app MainActivity. Needed for `plyer`.
diff --git a/src/serious_python_linux/pubspec.yaml b/src/serious_python_linux/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_linux
 description: Linux implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.6
+version: 0.8.7
 
 environment:
   sdk: '>=3.1.3 <4.0.0'
diff --git a/src/serious_python_platform_interface/CHANGELOG.md b/src/serious_python_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.7
+
+* Fixed: `xcframeworks` migration script didn't work for sub-directories.
+
 ## 0.8.6
 
 * Added `com.flet.serious_python_android.PythonActivity` holder class with `mActivity` holding a reference to an app MainActivity. Needed for `plyer`.
diff --git a/src/serious_python_platform_interface/pubspec.yaml b/src/serious_python_platform_interface/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_platform_interface
 description: A common platform interface for the serious_python plugin.
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.6
+version: 0.8.7
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_windows/CHANGELOG.md b/src/serious_python_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.7
+
+* Fixed: `xcframeworks` migration script didn't work for sub-directories.
+
 ## 0.8.6
 
 * Added `com.flet.serious_python_android.PythonActivity` holder class with `mActivity` holding a reference to an app MainActivity. Needed for `plyer`.
diff --git a/src/serious_python_windows/pubspec.yaml b/src/serious_python_windows/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_windows
 description: Windows implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.6
+version: 0.8.7
 
 environment:
   sdk: '>=3.1.3 <4.0.0'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-eb21e6e3680f591dc1c2a20e8ef88b69cffdf67f724e3a938f8aa8a759acb036`
	`1`	`+e23e3aa0eeaae51a8bdf828f103237a86287b3580b5ced9b7039303c402d5e95`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`Pod::Spec.new do \|s\|`
`6`	`6`	`s.name = 'serious_python_darwin'`
`7`		`- s.version = '0.8.6'`
	`7`	`+ s.version = '0.8.7'`
`8`	`8`	`s.summary = 'A cross-platform plugin for adding embedded Python runtime to your Flutter apps.'`
`9`	`9`	`s.description = <<-DESC`
`10`	`10`	`A cross-platform plugin for adding embedded Python runtime to your Flutter apps.`