Skip to content

Commit 8c1e6a4

Browse files
committed
Examples: drop the jni 1.0.0 override; jni_flutter 1.0.4+1 requires jni ^1.1.0
The override worked around dart-lang/native#3498 (aarch64 build failure in jni 1.0.1), which jni 1.0.3 fixed. jni_flutter 1.0.4+1's generated bindings assert jni ^1.1.0, so forcing 1.0.0 now fails every example build with 'The generated bindings expect package:jni ^1.1.0, but 1.0.x was imported.' Same fix as flet-dev/flet#6920.
1 parent 072a8dc commit 8c1e6a4

5 files changed

Lines changed: 38 additions & 49 deletions

File tree

‎src/serious_python/example/bridge_example/pubspec.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,5 @@ dev_dependencies:
2424
sdk: flutter
2525
flutter_lints: ^2.0.0
2626

27-
# jni arrives transitively (path_provider -> path_provider_android ->
28-
# jni_flutter -> jni). 1.0.1 added global_jni_env.c, which passes a `va_list`
29-
# where a `void *` is expected: fine on x86_64, where va_list is an array type
30-
# that decays to a pointer, but a hard error on aarch64, where it's a struct.
31-
# That breaks `flutter build linux` on ARM64 hosts. Tracked upstream at
32-
# dart-lang/native#3498 — drop this override once a fixed jni is released.
33-
dependency_overrides:
34-
jni: 1.0.0
35-
3627
flutter:
3728
uses-material-design: true

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,21 +156,29 @@ packages:
156156
source: hosted
157157
version: "4.1.2"
158158
jni:
159-
dependency: "direct overridden"
159+
dependency: transitive
160160
description:
161161
name: jni
162-
sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f
162+
sha256: "6b9ca0602fef0230e83149afbe3f9f8227e94f2bbe84a1da4f14d699742f402d"
163163
url: "https://pub.dev"
164164
source: hosted
165-
version: "1.0.0"
165+
version: "1.1.0"
166166
jni_flutter:
167167
dependency: transitive
168168
description:
169169
name: jni_flutter
170-
sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6"
170+
sha256: "0dd33d67797560f66e961a6053882d4df54bd345bf063b8fe7ea133f7ad8b191"
171+
url: "https://pub.dev"
172+
source: hosted
173+
version: "1.0.4+1"
174+
jni_util:
175+
dependency: transitive
176+
description:
177+
name: jni_util
178+
sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f"
171179
url: "https://pub.dev"
172180
source: hosted
173-
version: "1.0.1"
181+
version: "1.0.0"
174182
leak_tracker:
175183
dependency: transitive
176184
description:
@@ -361,42 +369,42 @@ packages:
361369
path: "../.."
362370
relative: true
363371
source: path
364-
version: "5.0.0"
372+
version: "6.0.0"
365373
serious_python_android:
366374
dependency: transitive
367375
description:
368376
path: "../../../serious_python_android"
369377
relative: true
370378
source: path
371-
version: "5.0.0"
379+
version: "6.0.0"
372380
serious_python_darwin:
373381
dependency: transitive
374382
description:
375383
path: "../../../serious_python_darwin"
376384
relative: true
377385
source: path
378-
version: "5.0.0"
386+
version: "6.0.0"
379387
serious_python_linux:
380388
dependency: transitive
381389
description:
382390
path: "../../../serious_python_linux"
383391
relative: true
384392
source: path
385-
version: "5.0.0"
393+
version: "6.0.0"
386394
serious_python_platform_interface:
387395
dependency: transitive
388396
description:
389397
path: "../../../serious_python_platform_interface"
390398
relative: true
391399
source: path
392-
version: "5.0.0"
400+
version: "6.0.0"
393401
serious_python_windows:
394402
dependency: transitive
395403
description:
396404
path: "../../../serious_python_windows"
397405
relative: true
398406
source: path
399-
version: "5.0.0"
407+
version: "6.0.0"
400408
shelf:
401409
dependency: transitive
402410
description:

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ dev_dependencies:
5656
# following page: https://dart.dev/tools/pub/pubspec
5757

5858
# The following section is specific to Flutter packages.
59-
# jni arrives transitively (path_provider -> path_provider_android ->
60-
# jni_flutter -> jni). 1.0.1 added global_jni_env.c, which passes a `va_list`
61-
# where a `void *` is expected: fine on x86_64, where va_list is an array type
62-
# that decays to a pointer, but a hard error on aarch64, where it's a struct.
63-
# That breaks `flutter build linux` on ARM64 hosts. Tracked upstream at
64-
# dart-lang/native#3498 — drop this override once a fixed jni is released.
65-
dependency_overrides:
66-
jni: 1.0.0
67-
6859
flutter:
6960

7061
# The following line ensures that the Material Icons font is

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,29 @@ packages:
171171
source: sdk
172172
version: "0.0.0"
173173
jni:
174-
dependency: "direct overridden"
174+
dependency: transitive
175175
description:
176176
name: jni
177-
sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f
177+
sha256: "6b9ca0602fef0230e83149afbe3f9f8227e94f2bbe84a1da4f14d699742f402d"
178178
url: "https://pub.dev"
179179
source: hosted
180-
version: "1.0.0"
180+
version: "1.1.0"
181181
jni_flutter:
182182
dependency: transitive
183183
description:
184184
name: jni_flutter
185-
sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6"
185+
sha256: "0dd33d67797560f66e961a6053882d4df54bd345bf063b8fe7ea133f7ad8b191"
186+
url: "https://pub.dev"
187+
source: hosted
188+
version: "1.0.4+1"
189+
jni_util:
190+
dependency: transitive
191+
description:
192+
name: jni_util
193+
sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f"
186194
url: "https://pub.dev"
187195
source: hosted
188-
version: "1.0.1"
196+
version: "1.0.0"
189197
leak_tracker:
190198
dependency: transitive
191199
description:
@@ -384,42 +392,42 @@ packages:
384392
path: "../.."
385393
relative: true
386394
source: path
387-
version: "5.0.0"
395+
version: "6.0.0"
388396
serious_python_android:
389397
dependency: transitive
390398
description:
391399
path: "../../../serious_python_android"
392400
relative: true
393401
source: path
394-
version: "5.0.0"
402+
version: "6.0.0"
395403
serious_python_darwin:
396404
dependency: transitive
397405
description:
398406
path: "../../../serious_python_darwin"
399407
relative: true
400408
source: path
401-
version: "5.0.0"
409+
version: "6.0.0"
402410
serious_python_linux:
403411
dependency: transitive
404412
description:
405413
path: "../../../serious_python_linux"
406414
relative: true
407415
source: path
408-
version: "5.0.0"
416+
version: "6.0.0"
409417
serious_python_platform_interface:
410418
dependency: transitive
411419
description:
412420
path: "../../../serious_python_platform_interface"
413421
relative: true
414422
source: path
415-
version: "5.0.0"
423+
version: "6.0.0"
416424
serious_python_windows:
417425
dependency: transitive
418426
description:
419427
path: "../../../serious_python_windows"
420428
relative: true
421429
source: path
422-
version: "5.0.0"
430+
version: "6.0.0"
423431
shelf:
424432
dependency: transitive
425433
description:

‎src/serious_python/example/run_example/pubspec.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,6 @@ dev_dependencies:
5858
# following page: https://dart.dev/tools/pub/pubspec
5959

6060
# The following section is specific to Flutter packages.
61-
# jni arrives transitively (path_provider -> path_provider_android ->
62-
# jni_flutter -> jni). 1.0.1 added global_jni_env.c, which passes a `va_list`
63-
# where a `void *` is expected: fine on x86_64, where va_list is an array type
64-
# that decays to a pointer, but a hard error on aarch64, where it's a struct.
65-
# That breaks `flutter build linux` on ARM64 hosts. Tracked upstream at
66-
# dart-lang/native#3498 — drop this override once a fixed jni is released.
67-
dependency_overrides:
68-
jni: 1.0.0
69-
7061
flutter:
7162

7263
# The following line ensures that the Material Icons font is

0 commit comments

Comments
 (0)