From 2dc3f1970a07a75627d9a7b0a32fe077030829e8 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 14:43:32 -0800 Subject: [PATCH 1/7] [package_info] Ensure async works in the integration_test app. --- .../example/test_driver/integration_test.dart | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/package_info/example/test_driver/integration_test.dart b/packages/package_info/example/test_driver/integration_test.dart index f532c389a02b..7a2c21338786 100644 --- a/packages/package_info/example/test_driver/integration_test.dart +++ b/packages/package_info/example/test_driver/integration_test.dart @@ -2,17 +2,15 @@ // for details. All rights reserved. Use of this source code is governed by a // 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'; Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); - final String data = await driver.requestData( - null, - timeout: const Duration(minutes: 1), - ); + final String data = + await driver.requestData(null, timeout: const Duration(minutes: 1)); await driver.close(); final Map result = jsonDecode(data); exit(result['result'] == 'true' ? 0 : 1); From 72641358f38468051073c03db87fbd587370a6fd Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 15:33:31 -0800 Subject: [PATCH 2/7] Add SplashScreenUntilFirstFrame --- .../example/android/app/src/main/AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index e4d033e8d8dd..a53b12531b26 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -9,6 +9,9 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + From b8065fecd9b2d3e27cef90cb5165e8edab676a1a Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 15:49:06 -0800 Subject: [PATCH 3/7] Register IntegrationTestPlugin --- .../flutter/plugins/packageinfoexample/EmbedderV1Activity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index a32c50484838..050e5788338a 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.packageinfoexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.packageinfo.PackageInfoPlugin; @@ -14,5 +15,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); PackageInfoPlugin.registerWith( registrarFor("io.flutter.plugins.packageinfo.PackageInfoPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); } } From e1eca572e27a4c60eaf1daa875385e979c56319b Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 16:22:45 -0800 Subject: [PATCH 4/7] Fix format --- .../flutter/plugins/packageinfoexample/EmbedderV1Activity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index 050e5788338a..eb669bf16109 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -16,6 +16,6 @@ protected void onCreate(Bundle savedInstanceState) { PackageInfoPlugin.registerWith( registrarFor("io.flutter.plugins.packageinfo.PackageInfoPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); } } From 54cbc0e46f0993de2ff1257e7e6268f9c907b063 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 16:23:01 -0800 Subject: [PATCH 5/7] Revert "[package_info] Ensure async works in the integration_test app." This reverts commit 2dc3f1970a07a75627d9a7b0a32fe077030829e8. --- .../example/test_driver/integration_test.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/package_info/example/test_driver/integration_test.dart b/packages/package_info/example/test_driver/integration_test.dart index 7a2c21338786..f532c389a02b 100644 --- a/packages/package_info/example/test_driver/integration_test.dart +++ b/packages/package_info/example/test_driver/integration_test.dart @@ -2,15 +2,17 @@ // for details. All rights reserved. Use of this source code is governed by a // 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'; Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); - final String data = - await driver.requestData(null, timeout: const Duration(minutes: 1)); + final String data = await driver.requestData( + null, + timeout: const Duration(minutes: 1), + ); await driver.close(); final Map result = jsonDecode(data); exit(result['result'] == 'true' ? 0 : 1); From 81099a9c25913905c988b4f49c433c028e1a1797 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 16:23:20 -0800 Subject: [PATCH 6/7] Revert "Add SplashScreenUntilFirstFrame" This reverts commit 72641358f38468051073c03db87fbd587370a6fd. --- .../example/android/app/src/main/AndroidManifest.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index a53b12531b26..e4d033e8d8dd 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -9,9 +9,6 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - From ee3cac9dd38eebfb199200829686ba88801387d6 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 28 Jan 2021 16:28:21 -0800 Subject: [PATCH 7/7] Bump version and CHANGELOG --- packages/package_info/CHANGELOG.md | 4 ++++ packages/package_info/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index ebb95c1da17e..f3f7734a4082 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.3+4 + +* Ensure `IntegrationTestPlugin` is registered in `example` app, so Firebase Test Lab tests report test results correctly. [Issue](https://github.com/flutter/flutter/issues/74944). + ## 0.4.3+3 * Update Flutter SDK constraint. diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 884a71659a48..25e45a6be7bc 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/package_info # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.4.3+3 +version: 0.4.3+4 flutter: plugin: