From 8127546e0b230945ca2d8803dae0e5a5c04c18bb Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Sun, 16 Jul 2023 10:20:47 -0400 Subject: [PATCH 01/13] [ci] Try 8 cores for comparison --- .ci.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 8702a476974..3c904042c5d 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -118,7 +118,6 @@ targets: target_file: dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux dart_unit_test_shard_2 master @@ -129,7 +128,6 @@ targets: target_file: dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux dart_unit_test_shard_1 stable @@ -139,7 +137,6 @@ targets: target_file: dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux dart_unit_test_shard_2 stable @@ -149,7 +146,6 @@ targets: target_file: dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_1 master @@ -160,7 +156,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_2 master @@ -171,7 +166,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_1 stable @@ -181,7 +175,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_2 stable @@ -191,7 +184,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux analyze master @@ -251,7 +243,6 @@ targets: add_recipes_cq: "true" version_file: flutter_master.version target_file: linux_custom_package_tests.yaml - cores: "32" # Pigeon tests need Andoid deps (thus the Linux_android base) and # clang-format. # web_benchmarks needs Chrome. @@ -268,7 +259,6 @@ targets: properties: version_file: flutter_stable.version target_file: linux_custom_package_tests.yaml - cores: "32" # See comments on 'master' version above. dependencies: >- [ @@ -313,7 +303,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 6" - name: Linux_android android_platform_tests_shard_2 master @@ -323,7 +312,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 6" - name: Linux_android android_platform_tests_shard_3 master @@ -333,7 +321,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 2 --shardCount 6" - name: Linux_android android_platform_tests_shard_4 master @@ -343,7 +330,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 3 --shardCount 6" - name: Linux_android android_platform_tests_shard_5 master @@ -353,7 +339,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 4 --shardCount 6" - name: Linux_android android_platform_tests_shard_6 master @@ -363,7 +348,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 5 --shardCount 6" - name: Linux_android android_platform_tests_shard_1 stable @@ -374,7 +358,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 6" - name: Linux_android android_platform_tests_shard_2 stable @@ -385,7 +368,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 6" - name: Linux_android android_platform_tests_shard_3 stable @@ -396,7 +378,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 2 --shardCount 6" - name: Linux_android android_platform_tests_shard_4 stable @@ -407,7 +388,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 3 --shardCount 6" - name: Linux_android android_platform_tests_shard_5 stable @@ -418,7 +398,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 4 --shardCount 6" - name: Linux_android android_platform_tests_shard_6 stable @@ -429,7 +408,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 5 --shardCount 6" ### Web tasks ### @@ -455,7 +433,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_master.version channel: master package_sharding: "--shardIndex 0 --shardCount 2" @@ -465,7 +442,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_master.version channel: master package_sharding: "--shardIndex 1 --shardCount 2" @@ -475,7 +451,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_stable.version channel: stable package_sharding: "--shardIndex 0 --shardCount 2" @@ -485,7 +460,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_stable.version channel: stable package_sharding: "--shardIndex 1 --shardCount 2" From 9919a602f9eabf1c0e3828cf80d74e4decd2d603 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Sun, 16 Jul 2023 18:56:49 -0400 Subject: [PATCH 02/13] Trigger a second run for more timing info --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 3c904042c5d..24cb7634769 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -2,7 +2,7 @@ # # Flutter infra uses this file to generate a checklist of tasks to be performed # for every commit. -# +# # More information at: # * https://github.com/flutter/cocoon/blob/main/CI_YAML.md enabled_branches: From a2760e00283436093c15bc29580bcdb1ca538b67 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 17 Jul 2023 11:26:59 -0400 Subject: [PATCH 03/13] Add more shards --- .ci.yaml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 24cb7634769..5615c81dd08 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -2,7 +2,7 @@ # # Flutter infra uses this file to generate a checklist of tasks to be performed # for every commit. -# +# # More information at: # * https://github.com/flutter/cocoon/blob/main/CI_YAML.md enabled_branches: @@ -446,6 +446,18 @@ targets: channel: master package_sharding: "--shardIndex 1 --shardCount 2" + - name: Linux_web web_platform_tests_shard_3 master + # TODO(stuartmorgan): Adjust the shard count for the other targets + # when removing this. + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + target_file: web_platform_tests.yaml + version_file: flutter_master.version + channel: master + package_sharding: "--shardIndex 2 --shardCount 3" + - name: Linux_web web_platform_tests_shard_1 stable recipe: packages/packages timeout: 60 @@ -464,6 +476,18 @@ targets: channel: stable package_sharding: "--shardIndex 1 --shardCount 2" + - name: Linux_web web_platform_tests_shard_3 stable + # TODO(stuartmorgan): Adjust the shard count for the other targets + # when removing this. + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + target_file: web_platform_tests.yaml + version_file: flutter_stable.version + channel: stable + package_sharding: "--shardIndex 2 --shardCount 3" + ### Linux desktop tasks - name: Linux_desktop build_all_packages master recipe: packages/packages @@ -734,6 +758,7 @@ targets: {"dependency": "open_jdk", "version": "version:11"} ] + # TODO(stuartmorgan): Remove these two when enabling the sharded versions. - name: Windows win32-platform_tests master - packages recipe: packages/packages timeout: 60 @@ -760,6 +785,66 @@ targets: {"dependency": "vs_build", "version": "version:vs2019"} ] + - name: Windows win32-platform_tests_shard_1 master + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: master + version_file: flutter_master.version + package_sharding: "--shardIndex 0 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + + - name: Windows win32-platform_tests_shard_2 master + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: master + version_file: flutter_master.version + package_sharding: "--shardIndex 1 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + + - name: Windows win32-platform_tests_shard_1 stable + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: stable + version_file: flutter_stable.version + package_sharding: "--shardIndex 0 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + + - name: Windows win32-platform_tests_shard_2 stable + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: stable + version_file: flutter_stable.version + package_sharding: "--shardIndex 1 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + - name: Windows windows-build_all_packages master recipe: packages/packages timeout: 30 From 74b0d4d486eccecdcbd867ce7b9d448b620c4fc0 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 17 Jul 2023 11:41:12 -0400 Subject: [PATCH 04/13] Add emulators --- .ci.yaml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index 5615c81dd08..04d7e2795d7 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -304,6 +304,10 @@ targets: channel: master version_file: flutter_master.version package_sharding: "--shardIndex 0 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_2 master recipe: packages/packages @@ -313,6 +317,10 @@ targets: channel: master version_file: flutter_master.version package_sharding: "--shardIndex 1 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_3 master recipe: packages/packages @@ -322,6 +330,10 @@ targets: channel: master version_file: flutter_master.version package_sharding: "--shardIndex 2 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_4 master recipe: packages/packages @@ -331,6 +343,10 @@ targets: channel: master version_file: flutter_master.version package_sharding: "--shardIndex 3 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_5 master recipe: packages/packages @@ -340,6 +356,10 @@ targets: channel: master version_file: flutter_master.version package_sharding: "--shardIndex 4 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_6 master recipe: packages/packages @@ -349,6 +369,10 @@ targets: channel: master version_file: flutter_master.version package_sharding: "--shardIndex 5 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_1 stable recipe: packages/packages @@ -359,6 +383,10 @@ targets: channel: stable version_file: flutter_stable.version package_sharding: "--shardIndex 0 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_2 stable recipe: packages/packages @@ -369,6 +397,10 @@ targets: channel: stable version_file: flutter_stable.version package_sharding: "--shardIndex 1 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_3 stable recipe: packages/packages @@ -379,6 +411,10 @@ targets: channel: stable version_file: flutter_stable.version package_sharding: "--shardIndex 2 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_4 stable recipe: packages/packages @@ -389,6 +425,10 @@ targets: channel: stable version_file: flutter_stable.version package_sharding: "--shardIndex 3 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_5 stable recipe: packages/packages @@ -399,6 +439,10 @@ targets: channel: stable version_file: flutter_stable.version package_sharding: "--shardIndex 4 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] - name: Linux_android android_platform_tests_shard_6 stable recipe: packages/packages @@ -409,6 +453,10 @@ targets: channel: stable version_file: flutter_stable.version package_sharding: "--shardIndex 5 --shardCount 6" + dependencies: >- + [ + {"dependency": "android_virtual_device", "version": "33"} + ] ### Web tasks ### - name: Linux_web web_build_all_packages master From 4f83c87991b96ba58a155337767317e075feebad Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 17 Jul 2023 11:43:51 -0400 Subject: [PATCH 05/13] Enable simulator-based tests --- .ci/targets/android_platform_tests.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.ci/targets/android_platform_tests.yaml b/.ci/targets/android_platform_tests.yaml index 70ca7b1adcb..c0d72da30df 100644 --- a/.ci/targets/android_platform_tests.yaml +++ b/.ci/targets/android_platform_tests.yaml @@ -19,12 +19,9 @@ tasks: - name: native unit tests script: script/tool_runner.sh args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"] - # TODO(stuartmorgan): Enable these once - # https://github.com/flutter/flutter/issues/120736 is implemented. - # See also https://github.com/flutter/flutter/issues/114373 - #- name: native integration tests - # script: script/tool_runner.sh - # args: ["native-test", "--android", "--no-unit"] - #- name: drive examples - # script: script/tool_runner.sh - # args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml"] + - name: native integration tests + script: script/tool_runner.sh + args: ["native-test", "--android", "--no-unit"] + - name: drive examples + script: script/tool_runner.sh + args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml"] From 3e250aa7bf166ae50aae054eb68a205bde3b1b2e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 17 Jul 2023 14:20:30 -0400 Subject: [PATCH 06/13] Add missing debug entitlement for `shared_preferences` --- .../example/android/app/src/debug/AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/shared_preferences/shared_preferences/example/android/app/src/debug/AndroidManifest.xml diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/debug/AndroidManifest.xml b/packages/shared_preferences/shared_preferences/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000000..d60d6f69a86 --- /dev/null +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + From ff792e79ea69aac57c65663df57aa5b48b8084b4 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 17 Jul 2023 14:37:01 -0400 Subject: [PATCH 07/13] Add changelog note --- packages/shared_preferences/shared_preferences/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md index aac9038c416..0aaabb03ca3 100644 --- a/packages/shared_preferences/shared_preferences/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixed the example app to be debuggable on Android. + ## 2.2.0 * Adds `allowList` option to setPrefix. From 025817d2ba0e36c69e85a89092edb93b15c11d12 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 20 Jul 2023 09:24:37 -0400 Subject: [PATCH 08/13] Exclude camera to see what else is broken --- script/configs/exclude_integration_android_emulator.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 script/configs/exclude_integration_android_emulator.yaml diff --git a/script/configs/exclude_integration_android_emulator.yaml b/script/configs/exclude_integration_android_emulator.yaml new file mode 100644 index 00000000000..cff106dc7ef --- /dev/null +++ b/script/configs/exclude_integration_android_emulator.yaml @@ -0,0 +1,2 @@ +# TODO: File issues and reference them. +- camera/camera From 57c3be4a9deb85980c49b547dff35986301ea847 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 20 Jul 2023 09:32:45 -0400 Subject: [PATCH 09/13] Fix test calls in in_app_purchace_android --- .../in_app_purchase_test.dart | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase_android/example/integration_test/in_app_purchase_test.dart b/packages/in_app_purchase/in_app_purchase_android/example/integration_test/in_app_purchase_test.dart index ecf43d290c5..568becd7188 100644 --- a/packages/in_app_purchase/in_app_purchase_android/example/integration_test/in_app_purchase_test.dart +++ b/packages/in_app_purchase/in_app_purchase_android/example/integration_test/in_app_purchase_test.dart @@ -30,7 +30,8 @@ void main() { billingClient = BillingClient((PurchasesResultWrapper _) {}); }); - test('BillingClient.acknowledgePurchase', () async { + testWidgets('BillingClient.acknowledgePurchase', + (WidgetTester tester) async { try { await billingClient.acknowledgePurchase('purchaseToken'); } on MissingPluginException { @@ -38,7 +39,7 @@ void main() { } }); - test('BillingClient.consumeAsync', () async { + testWidgets('BillingClient.consumeAsync', (WidgetTester tester) async { try { await billingClient.consumeAsync('purchaseToken'); } on MissingPluginException { @@ -46,7 +47,7 @@ void main() { } }); - test('BillingClient.endConnection', () async { + testWidgets('BillingClient.endConnection', (WidgetTester tester) async { try { await billingClient.endConnection(); } on MissingPluginException { @@ -54,7 +55,8 @@ void main() { } }); - test('BillingClient.isFeatureSupported', () async { + testWidgets('BillingClient.isFeatureSupported', + (WidgetTester tester) async { try { await billingClient .isFeatureSupported(BillingClientFeature.productDetails); @@ -63,7 +65,7 @@ void main() { } }); - test('BillingClient.isReady', () async { + testWidgets('BillingClient.isReady', (WidgetTester tester) async { try { await billingClient.isReady(); } on MissingPluginException { @@ -71,7 +73,7 @@ void main() { } }); - test('BillingClient.launchBillingFlow', () async { + testWidgets('BillingClient.launchBillingFlow', (WidgetTester tester) async { try { await billingClient.launchBillingFlow(product: 'product'); } on MissingPluginException { @@ -84,7 +86,8 @@ void main() { } }); - test('BillingClient.queryProductDetails', () async { + testWidgets('BillingClient.queryProductDetails', + (WidgetTester tester) async { try { await billingClient .queryProductDetails(productList: []); @@ -99,7 +102,8 @@ void main() { } }); - test('BillingClient.queryPurchaseHistory', () async { + testWidgets('BillingClient.queryPurchaseHistory', + (WidgetTester tester) async { try { await billingClient.queryPurchaseHistory(ProductType.inapp); } on MissingPluginException { @@ -107,7 +111,7 @@ void main() { } }); - test('BillingClient.queryPurchases', () async { + testWidgets('BillingClient.queryPurchases', (WidgetTester tester) async { try { await billingClient.queryPurchases(ProductType.inapp); } on MissingPluginException { @@ -115,7 +119,7 @@ void main() { } }); - test('BillingClient.startConnection', () async { + testWidgets('BillingClient.startConnection', (WidgetTester tester) async { try { await billingClient.startConnection( onBillingServiceDisconnected: () {}); From 3b974c4ef1b873ba993a4515eeaf14114816e1f8 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 20 Jul 2023 10:23:39 -0400 Subject: [PATCH 10/13] Update exclusions --- script/configs/exclude_integration_android_emulator.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/configs/exclude_integration_android_emulator.yaml b/script/configs/exclude_integration_android_emulator.yaml index cff106dc7ef..a49171e0dbb 100644 --- a/script/configs/exclude_integration_android_emulator.yaml +++ b/script/configs/exclude_integration_android_emulator.yaml @@ -1,2 +1,7 @@ -# TODO: File issues and reference them. +# Hangs due to permission issue, see https://github.com/flutter/flutter/issues/130987 +# TODO(stuartmorgan): Remove once the permission issue is addressed. - camera/camera +- camera_android +# Frequent flaky failures, see https://github.com/flutter/flutter/issues/130986 +# TODO(stuartmorgan): Remove once the flake is fixed. +- google_maps_flutter_android From bb1bf21be76b270283cf9ab50547b442185cf178 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 20 Jul 2023 11:15:06 -0400 Subject: [PATCH 11/13] Actually use the new exclusions --- .ci/targets/android_platform_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/targets/android_platform_tests.yaml b/.ci/targets/android_platform_tests.yaml index c0d72da30df..7ee17677857 100644 --- a/.ci/targets/android_platform_tests.yaml +++ b/.ci/targets/android_platform_tests.yaml @@ -24,4 +24,4 @@ tasks: args: ["native-test", "--android", "--no-unit"] - name: drive examples script: script/tool_runner.sh - args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml"] + args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"] From d02545aaa25a299af5e765ca6d2908de169637b6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 20 Jul 2023 13:03:15 -0400 Subject: [PATCH 12/13] CameraX is also a camera --- script/configs/exclude_integration_android_emulator.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/script/configs/exclude_integration_android_emulator.yaml b/script/configs/exclude_integration_android_emulator.yaml index a49171e0dbb..bcb8c4f00a6 100644 --- a/script/configs/exclude_integration_android_emulator.yaml +++ b/script/configs/exclude_integration_android_emulator.yaml @@ -2,6 +2,7 @@ # TODO(stuartmorgan): Remove once the permission issue is addressed. - camera/camera - camera_android +- camera_android_camerax # Frequent flaky failures, see https://github.com/flutter/flutter/issues/130986 # TODO(stuartmorgan): Remove once the flake is fixed. - google_maps_flutter_android From fc38ce05f0f3ab7f5f604a9f0d575a5778a181a6 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 21 Jul 2023 14:41:34 -0400 Subject: [PATCH 13/13] Fix changelog style --- packages/shared_preferences/shared_preferences/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md index 7daadefa912..af6872db150 100644 --- a/packages/shared_preferences/shared_preferences/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md @@ -1,6 +1,6 @@ ## NEXT -* Fixed the example app to be debuggable on Android. +* Fixes the example app to be debuggable on Android. * Deletes deprecated splash screen meta-data element. ## 2.2.0