From 8a7dece0666b7801cb710e8e8d87e6c510a2b673 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Mon, 1 Feb 2021 20:35:59 +0100 Subject: [PATCH 1/5] enable channel beta on CI --- .github/workflows/all_plugins.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index cd6fc04857..ebbc0473c1 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -20,7 +20,7 @@ jobs: with: fetch-depth: 0 - name: 'Install Flutter' - run: ./.github/workflows/scripts/install-flutter.sh stable + run: ./.github/workflows/scripts/install-flutter.sh beta - name: 'Install Tools' run: | ./.github/workflows/scripts/install-tools.sh @@ -43,7 +43,7 @@ jobs: with: fetch-depth: 0 - name: 'Install Flutter' - run: ./.github/workflows/scripts/install-flutter.sh stable + run: ./.github/workflows/scripts/install-flutter.sh beta - name: 'Install Tools' run: | ./.github/workflows/scripts/install-tools.sh @@ -75,7 +75,7 @@ jobs: with: fetch-depth: 0 - name: 'Install Flutter' - run: ./.github/workflows/scripts/install-flutter.sh stable + run: ./.github/workflows/scripts/install-flutter.sh beta - name: 'Install Tools' run: ./.github/workflows/scripts/install-tools.sh - name: 'Bootstrap Workspace' @@ -92,7 +92,7 @@ jobs: with: fetch-depth: 0 - name: 'Install Flutter' - run: ./.github/workflows/scripts/install-flutter.sh stable + run: ./.github/workflows/scripts/install-flutter.sh beta - name: 'Install Tools' run: ./.github/workflows/scripts/install-tools.sh - name: 'Bootstrap Workspace' From d341754baa4fafdb08e0bca089f454727c16f360 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Mon, 1 Feb 2021 20:41:07 +0100 Subject: [PATCH 2/5] replace build aot by assemble #89 --- .github/workflows/all_plugins.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index ebbc0473c1..3ae30956c1 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -83,7 +83,7 @@ jobs: - name: 'Build Example Snapshots' run: | melos exec -c 1 --scope="*example*" -- \ - flutter build aot + flutter build apk test: runs-on: ubuntu-latest timeout-minutes: 15 From 5fcdf3136aad0115307796acdeb9a4ac7ce7b6f5 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 2 Feb 2021 08:45:17 +0100 Subject: [PATCH 3/5] run build bundle --- .github/workflows/all_plugins.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index 3ae30956c1..cbbf5920f7 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -83,7 +83,7 @@ jobs: - name: 'Build Example Snapshots' run: | melos exec -c 1 --scope="*example*" -- \ - flutter build apk + flutter build bundle test: runs-on: ubuntu-latest timeout-minutes: 15 From b684c6c2f8403cf78f092d259ba84b9f0337e622 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 2 Feb 2021 08:58:04 +0100 Subject: [PATCH 4/5] imported changes from https://github.com/flutter/plugins/commit/89b6efb6df5afa50c754abb6775b8105fc611476 --- .../android_alarm_manager_plus_e2e_test.dart | 38 ++++--------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e_test.dart b/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e_test.dart index 7fe1e5d061..1d66d3239c 100644 --- a/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e_test.dart +++ b/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e_test.dart @@ -3,42 +3,18 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; +import 'dart:convert'; import 'dart:io'; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:vm_service_client/vm_service_client.dart'; - -Future> resumeIsolatesOnPause( - FlutterDriver driver) async { - final vm = await driver.serviceClient.getVM(); - print('for isolates'); - for (final isolateRef in vm.isolates) { - final isolate = await isolateRef.load(); - if (isolate.isPaused) { - print('isolate.resume'); - await isolate.resume(); - } - } - return driver.serviceClient.onIsolateRunnable - .asBroadcastStream() - .listen((VMIsolateRef isolateRef) async { - print('onIsolateRunnable'); - final isolate = await isolateRef.load(); - if (isolate.isPaused) { - print('isolate.resume'); - await isolate.resume(); - } - }); -} Future main() async { final driver = await FlutterDriver.connect(); - // flutter drive causes isolates to be paused on spawn. The background isolate - // for this plugin will need to be resumed for the test to pass. - final subscription = await resumeIsolatesOnPause(driver); - final result = - await driver.requestData(null, timeout: const Duration(minutes: 5)); + final data = await driver.requestData( + null, + timeout: const Duration(minutes: 1), + ); await driver.close(); - await subscription.cancel(); - exit(result == 'pass' ? 0 : 1); + final Map result = jsonDecode(data); + exit(result['result'] == 'true' ? 0 : 1); } From 3055aa04b858483e3251a7c072e0b31fd0a3fd56 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 2 Feb 2021 09:01:25 +0100 Subject: [PATCH 5/5] 'onError' is deprecated --- packages/device_info_plus/example/lib/main.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/device_info_plus/example/lib/main.dart b/packages/device_info_plus/example/lib/main.dart index d8b4493f50..3746a7560f 100644 --- a/packages/device_info_plus/example/lib/main.dart +++ b/packages/device_info_plus/example/lib/main.dart @@ -13,9 +13,9 @@ import 'package:flutter/services.dart'; import 'package:device_info_plus/device_info_plus.dart'; void main() { - runZoned(() { + runZonedGuarded(() { runApp(MyApp()); - }, onError: (dynamic error, dynamic stack) { + }, (dynamic error, dynamic stack) { print(error); print(stack); });