Skip to content

Commit 2c8d2bc

Browse files
jesswrdjesswrd
authored
Bump AVD and SDK to API 36 in Packages CI (flutter#9414)
Bumping AVD, SDK we test against to ensure Flutter works on Android 16. Also added potentially missing `android_virtual_device` dependency. This aligns with what has been and/or will be done in framework flutter/flutter#169121 and engine flutter/flutter#169124, flutter/flutter#167776. Partially Addresses flutter/flutter#163071 Fixes flutter/flutter#137083 ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent 111ceb7 commit 2c8d2bc

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

‎.ci.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ platform_properties:
2828
device_type: none
2929
dependencies: >-
3030
[
31-
{"dependency": "android_sdk", "version": "version:33v6"},
31+
{"dependency": "android_sdk", "version": "version:36v1"},
3232
{"dependency": "open_jdk", "version": "version:17"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
34-
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
34+
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}
3535
]
3636
linux_android_legacy:
3737
properties:
@@ -362,7 +362,7 @@ targets:
362362
# web_benchmarks needs Chrome.
363363
dependencies: >-
364364
[
365-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
365+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
366366
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
367367
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
368368
{"dependency": "ninja", "version": "version:1.9.0"},
@@ -385,7 +385,7 @@ targets:
385385
# See comments on 'master' version above.
386386
dependencies: >-
387387
[
388-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
388+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
389389
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
390390
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
391391
{"dependency": "ninja", "version": "version:1.9.0"},
@@ -435,7 +435,7 @@ targets:
435435
package_sharding: "--shardIndex 0 --shardCount 6"
436436
dependencies: >-
437437
[
438-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
438+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
439439
]
440440
env_variables: >-
441441
{
@@ -453,7 +453,7 @@ targets:
453453
package_sharding: "--shardIndex 1 --shardCount 6"
454454
dependencies: >-
455455
[
456-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
456+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
457457
]
458458
env_variables: >-
459459
{
@@ -471,7 +471,7 @@ targets:
471471
package_sharding: "--shardIndex 2 --shardCount 6"
472472
dependencies: >-
473473
[
474-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
474+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
475475
]
476476
env_variables: >-
477477
{
@@ -489,7 +489,7 @@ targets:
489489
package_sharding: "--shardIndex 3 --shardCount 6"
490490
dependencies: >-
491491
[
492-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
492+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
493493
]
494494
env_variables: >-
495495
{
@@ -507,7 +507,7 @@ targets:
507507
package_sharding: "--shardIndex 4 --shardCount 6"
508508
dependencies: >-
509509
[
510-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
510+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
511511
]
512512
env_variables: >-
513513
{
@@ -525,7 +525,7 @@ targets:
525525
package_sharding: "--shardIndex 5 --shardCount 6"
526526
dependencies: >-
527527
[
528-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
528+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
529529
]
530530
env_variables: >-
531531
{
@@ -544,7 +544,7 @@ targets:
544544
package_sharding: "--shardIndex 0 --shardCount 6"
545545
dependencies: >-
546546
[
547-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
547+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
548548
]
549549
env_variables: >-
550550
{
@@ -563,7 +563,7 @@ targets:
563563
package_sharding: "--shardIndex 1 --shardCount 6"
564564
dependencies: >-
565565
[
566-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
566+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
567567
]
568568
env_variables: >-
569569
{
@@ -582,7 +582,7 @@ targets:
582582
package_sharding: "--shardIndex 2 --shardCount 6"
583583
dependencies: >-
584584
[
585-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
585+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
586586
]
587587
env_variables: >-
588588
{
@@ -601,7 +601,7 @@ targets:
601601
package_sharding: "--shardIndex 3 --shardCount 6"
602602
dependencies: >-
603603
[
604-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
604+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
605605
]
606606
env_variables: >-
607607
{
@@ -620,7 +620,7 @@ targets:
620620
package_sharding: "--shardIndex 4 --shardCount 6"
621621
dependencies: >-
622622
[
623-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
623+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
624624
]
625625
env_variables: >-
626626
{
@@ -639,7 +639,7 @@ targets:
639639
package_sharding: "--shardIndex 5 --shardCount 6"
640640
dependencies: >-
641641
[
642-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
642+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
643643
]
644644
env_variables: >-
645645
{

‎packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,13 @@ Future<void> main() async {
535535
// Makes sure we get the correct event that indicates the video is actually playing.
536536
await videoPlaying.future;
537537

538-
final bool fullScreen = await controller
539-
.runJavaScriptReturningResult('isFullScreen();') as bool;
538+
Object fullScreen =
539+
await controller.runJavaScriptReturningResult('isFullScreen();');
540+
541+
if (fullScreen is String) {
542+
fullScreen = fullScreen == 'true';
543+
}
544+
540545
expect(fullScreen, false);
541546
});
542547

0 commit comments

Comments
 (0)