Skip to content

Commit 54685dc

Browse files
FeodorFitsnerFeodorFitsner
authored
Flet 0.9.1: fixing to work with macOS 12 and Xcode 14 (#146)
* Replace `realpath` with `pwd` for compatibility with macOS 12 Monterey * Define ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES * BUILD_LIBRARY_FOR_DISTRIBUTION * Test serious python on Xcode 14 * Remove BUILD_LIBRARY_FOR_DISTRIBUTION * Bump Flet version 0.9.1
1 parent e7e4279 commit 54685dc

File tree

26 files changed

+101
-76
lines changed

26 files changed

+101
-76
lines changed

‎.appveyor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99
- job_name: Test on macOS
1010
job_group: test_serious_python
1111
job_depends_on: build_python_darwin
12-
APPVEYOR_BUILD_WORKER_IMAGE: macos-ventura
12+
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
1313

1414
- job_name: Test on iOS
1515
job_group: test_serious_python
@@ -55,6 +55,7 @@ for:
5555
- source ci/install_flutter.sh
5656
- flutter config --enable-macos-desktop
5757
- flutter doctor -v
58+
- xcodebuild -version
5859

5960
build: off
6061

‎src/serious_python/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.1
2+
3+
* Fix `serious_python` to work on macOS 12 Monterey and built with Xcode 14.
4+
15
## 0.9.0
26

37
* Set `MinimumOSVersion` to `13.0` for generated Python frameworks.

‎src/serious_python/example/flask_example/pubspec.lock‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: collection
56-
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
56+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.19.0"
59+
version: "1.18.0"
6060
crypto:
6161
dependency: transitive
6262
description:
@@ -143,18 +143,18 @@ packages:
143143
dependency: transitive
144144
description:
145145
name: leak_tracker
146-
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
146+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
147147
url: "https://pub.dev"
148148
source: hosted
149-
version: "10.0.7"
149+
version: "10.0.4"
150150
leak_tracker_flutter_testing:
151151
dependency: transitive
152152
description:
153153
name: leak_tracker_flutter_testing
154-
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
154+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
155155
url: "https://pub.dev"
156156
source: hosted
157-
version: "3.0.8"
157+
version: "3.0.3"
158158
leak_tracker_testing:
159159
dependency: transitive
160160
description:
@@ -183,18 +183,18 @@ packages:
183183
dependency: transitive
184184
description:
185185
name: material_color_utilities
186-
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
186+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
187187
url: "https://pub.dev"
188188
source: hosted
189-
version: "0.11.1"
189+
version: "0.8.0"
190190
meta:
191191
dependency: transitive
192192
description:
193193
name: meta
194-
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
194+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
195195
url: "https://pub.dev"
196196
source: hosted
197-
version: "1.15.0"
197+
version: "1.12.0"
198198
path:
199199
dependency: transitive
200200
description:
@@ -281,42 +281,42 @@ packages:
281281
path: "../.."
282282
relative: true
283283
source: path
284-
version: "0.8.8"
284+
version: "0.9.0"
285285
serious_python_android:
286286
dependency: transitive
287287
description:
288288
path: "../../../serious_python_android"
289289
relative: true
290290
source: path
291-
version: "0.8.8"
291+
version: "0.9.0"
292292
serious_python_darwin:
293293
dependency: transitive
294294
description:
295295
path: "../../../serious_python_darwin"
296296
relative: true
297297
source: path
298-
version: "0.8.8"
298+
version: "0.9.0"
299299
serious_python_linux:
300300
dependency: transitive
301301
description:
302302
path: "../../../serious_python_linux"
303303
relative: true
304304
source: path
305-
version: "0.8.8"
305+
version: "0.9.0"
306306
serious_python_platform_interface:
307307
dependency: transitive
308308
description:
309309
path: "../../../serious_python_platform_interface"
310310
relative: true
311311
source: path
312-
version: "0.8.8"
312+
version: "0.9.0"
313313
serious_python_windows:
314314
dependency: transitive
315315
description:
316316
path: "../../../serious_python_windows"
317317
relative: true
318318
source: path
319-
version: "0.8.8"
319+
version: "0.9.0"
320320
shelf:
321321
dependency: transitive
322322
description:
@@ -329,7 +329,7 @@ packages:
329329
dependency: transitive
330330
description: flutter
331331
source: sdk
332-
version: "0.0.0"
332+
version: "0.0.99"
333333
source_span:
334334
dependency: transitive
335335
description:
@@ -342,10 +342,10 @@ packages:
342342
dependency: transitive
343343
description:
344344
name: stack_trace
345-
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
345+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
346346
url: "https://pub.dev"
347347
source: hosted
348-
version: "1.12.0"
348+
version: "1.11.1"
349349
stream_channel:
350350
dependency: transitive
351351
description:
@@ -358,10 +358,10 @@ packages:
358358
dependency: transitive
359359
description:
360360
name: string_scanner
361-
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
361+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
362362
url: "https://pub.dev"
363363
source: hosted
364-
version: "1.3.0"
364+
version: "1.2.0"
365365
term_glyph:
366366
dependency: transitive
367367
description:
@@ -374,10 +374,10 @@ packages:
374374
dependency: transitive
375375
description:
376376
name: test_api
377-
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
377+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
378378
url: "https://pub.dev"
379379
source: hosted
380-
version: "0.7.3"
380+
version: "0.7.0"
381381
toml:
382382
dependency: transitive
383383
description:
@@ -406,10 +406,10 @@ packages:
406406
dependency: transitive
407407
description:
408408
name: vm_service
409-
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
409+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
410410
url: "https://pub.dev"
411411
source: hosted
412-
version: "14.3.0"
412+
version: "14.2.1"
413413
web:
414414
dependency: transitive
415415
description:

‎src/serious_python/example/flet_example/pubspec.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: collection
56-
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
56+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.19.0"
59+
version: "1.18.0"
6060
cross_file:
6161
dependency: transitive
6262
description:
@@ -296,18 +296,18 @@ packages:
296296
dependency: transitive
297297
description:
298298
name: leak_tracker
299-
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
299+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
300300
url: "https://pub.dev"
301301
source: hosted
302-
version: "10.0.7"
302+
version: "10.0.4"
303303
leak_tracker_flutter_testing:
304304
dependency: transitive
305305
description:
306306
name: leak_tracker_flutter_testing
307-
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
307+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
308308
url: "https://pub.dev"
309309
source: hosted
310-
version: "3.0.8"
310+
version: "3.0.3"
311311
leak_tracker_testing:
312312
dependency: transitive
313313
description:
@@ -352,18 +352,18 @@ packages:
352352
dependency: transitive
353353
description:
354354
name: material_color_utilities
355-
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
355+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
356356
url: "https://pub.dev"
357357
source: hosted
358-
version: "0.11.1"
358+
version: "0.8.0"
359359
meta:
360360
dependency: transitive
361361
description:
362362
name: meta
363-
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
363+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
364364
url: "https://pub.dev"
365365
source: hosted
366-
version: "1.15.0"
366+
version: "1.12.0"
367367
package_info_plus:
368368
dependency: "direct main"
369369
description:
@@ -456,10 +456,10 @@ packages:
456456
dependency: transitive
457457
description:
458458
name: platform
459-
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
459+
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
460460
url: "https://pub.dev"
461461
source: hosted
462-
version: "3.1.5"
462+
version: "3.1.4"
463463
plugin_platform_interface:
464464
dependency: transitive
465465
description:
@@ -650,7 +650,7 @@ packages:
650650
dependency: transitive
651651
description: flutter
652652
source: sdk
653-
version: "0.0.0"
653+
version: "0.0.99"
654654
source_span:
655655
dependency: transitive
656656
description:
@@ -663,10 +663,10 @@ packages:
663663
dependency: transitive
664664
description:
665665
name: stack_trace
666-
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
666+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
667667
url: "https://pub.dev"
668668
source: hosted
669-
version: "1.12.0"
669+
version: "1.11.1"
670670
stream_channel:
671671
dependency: transitive
672672
description:
@@ -679,10 +679,10 @@ packages:
679679
dependency: transitive
680680
description:
681681
name: string_scanner
682-
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
682+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
683683
url: "https://pub.dev"
684684
source: hosted
685-
version: "1.3.0"
685+
version: "1.2.0"
686686
sync_http:
687687
dependency: transitive
688688
description:
@@ -703,10 +703,10 @@ packages:
703703
dependency: transitive
704704
description:
705705
name: test_api
706-
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
706+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
707707
url: "https://pub.dev"
708708
source: hosted
709-
version: "0.7.3"
709+
version: "0.7.0"
710710
toml:
711711
dependency: transitive
712712
description:
@@ -831,10 +831,10 @@ packages:
831831
dependency: transitive
832832
description:
833833
name: vm_service
834-
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
834+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
835835
url: "https://pub.dev"
836836
source: hosted
837-
version: "14.3.0"
837+
version: "14.2.1"
838838
web:
839839
dependency: transitive
840840
description:
@@ -855,10 +855,10 @@ packages:
855855
dependency: transitive
856856
description:
857857
name: webdriver
858-
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
858+
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
859859
url: "https://pub.dev"
860860
source: hosted
861-
version: "3.0.4"
861+
version: "3.0.3"
862862
win32:
863863
dependency: transitive
864864
description:

‎src/serious_python/example/run_example/app/app.zip.hash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b174ad80d464c0ca63c944b5fe66691c50fe5ab89e3830b3268cc1cf1362f7fb
1+
dbe287483eb06feb8b1082b48aab62ad61c20d7e02acfd8f10f80e107f99e2c5

‎src/serious_python/example/run_example/app/src/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
lru-dict
33
#pyjnius
44
#flet-libsodium
5-
pysodium
6-
numpy
7-
Pyrebase4
5+
# pysodium
6+
# numpy
7+
# Pyrebase4

‎src/serious_python/example/run_example/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PODS:
55
- path_provider_foundation (0.0.1):
66
- Flutter
77
- FlutterMacOS
8-
- serious_python_darwin (0.8.8):
8+
- serious_python_darwin (0.9.0):
99
- Flutter
1010
- FlutterMacOS
1111

@@ -29,7 +29,7 @@ SPEC CHECKSUMS:
2929
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
3030
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
3131
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
32-
serious_python_darwin: f50667f464e2ae2f73f4a0df8f904a690c3b7c03
32+
serious_python_darwin: f9c5bd0dc6fbe536075be8606baaf5eebae61ea8
3333

3434
PODFILE CHECKSUM: a57f30d18f102dd3ce366b1d62a55ecbef2158e5
3535

‎src/serious_python/example/run_example/macos/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PODS:
33
- path_provider_foundation (0.0.1):
44
- Flutter
55
- FlutterMacOS
6-
- serious_python_darwin (0.8.8):
6+
- serious_python_darwin (0.9.0):
77
- Flutter
88
- FlutterMacOS
99

@@ -22,8 +22,8 @@ EXTERNAL SOURCES:
2222

2323
SPEC CHECKSUMS:
2424
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
25-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
26-
serious_python_darwin: f50667f464e2ae2f73f4a0df8f904a690c3b7c03
25+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
26+
serious_python_darwin: 42f1e341ed20ad30072bf0fa15cc9406ffe0d631
2727

2828
PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3
2929

0 commit comments

Comments
 (0)