flutter · stuartmorgan-g · Mar 19, 2021 · Mar 17, 2021 · Mar 17, 2021 · Mar 17, 2021
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -9,6 +9,5 @@ packages/camera/**                             @bparrishMines
 packages/file_selector/**                      @ditman
 packages/google_maps_flutter/**                @cyanglaz
 packages/image_picker/**                       @cyanglaz
-packages/integration_test/**                   @dnfield
 packages/in_app_purchase/**                    @cyanglaz @LHLL
 packages/ios_platform_images/**                @gaaclarke
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -61,7 +61,7 @@ USB and debugging enabled on that device.
 
 ## Setting up XCUITests
 
-Sometimes, XCUITests are useful when integration testing a plugin that has native UI on iOS (e.g image_picker, in_app_purchase, camera, share, local_auth etc). Most of the time, XCUITests are not necessary, consider using [integration_test](https://pub.dev/packages/integration_test) if the tests are not focused on iOS system UI.
+Sometimes, XCUITests are useful when integration testing a plugin that has native UI on iOS (e.g image_picker, in_app_purchase, camera, share, local_auth etc). Most of the time, XCUITests are not necessary, consider using `integration_test` if the tests are not focused on iOS system UI.
 
 If XCUITests has always been set up for the plugin, a RunnerUITests folder under `<the_plugin>/example/ios` directory can be found.
 If XCUITests has not been set up for the plugin, follow these steps to set it up:

diff --git a/README.md b/README.md
@@ -47,13 +47,12 @@ These are the available plugins in this repository.
 | [camera](./packages/camera/) | [![pub package](https://img.shields.io/pub/v/camera.svg)](https://pub.dev/packages/camera) | [![pub points](https://badges.bar/camera/pub%20points)](https://pub.dev/packages/camera/score) | [![popularity](https://badges.bar/camera/popularity)](https://pub.dev/packages/camera/score) | [![likes](https://badges.bar/camera/likes)](https://pub.dev/packages/camera/score) |
 | [connectivity](./packages/connectivity/) | [![pub package](https://img.shields.io/pub/v/connectivity.svg)](https://pub.dev/packages/connectivity) | [![pub points](https://badges.bar/connectivity/pub%20points)](https://pub.dev/packages/connectivity/score) | [![popularity](https://badges.bar/connectivity/popularity)](https://pub.dev/packages/connectivity/score) | [![likes](https://badges.bar/connectivity/likes)](https://pub.dev/packages/connectivity/score) |
 | [device_info](./packages/device_info/) | [![pub package](https://img.shields.io/pub/v/device_info.svg)](https://pub.dev/packages/device_info) | [![pub points](https://badges.bar/device_info/pub%20points)](https://pub.dev/packages/device_info/score) | [![popularity](https://badges.bar/device_info/popularity)](https://pub.dev/packages/device_info/score) | [![likes](https://badges.bar/device_info/likes)](https://pub.dev/packages/device_info/score) |
-| [e2e (Discontinued, use integration_test)](./packages/e2e/) | [![pub package](https://img.shields.io/pub/v/e2e.svg)](https://pub.dev/packages/e2e) | [![pub points](https://badges.bar/e2e/pub%20points)](https://pub.dev/packages/e2e/score) | [![popularity](https://badges.bar/e2e/popularity)](https://pub.dev/packages/e2e/score) | [![likes](https://badges.bar/e2e/likes)](https://pub.dev/packages/e2e/score) |
 | [espresso](./packages/espresso/) | [![pub package](https://img.shields.io/pub/v/espresso.svg)](https://pub.dev/packages/espresso) | [![pub points](https://badges.bar/espresso/pub%20points)](https://pub.dev/packages/espresso/score) | [![popularity](https://badges.bar/espresso/popularity)](https://pub.dev/packages/espresso/score) | [![likes](https://badges.bar/espresso/likes)](https://pub.dev/packages/espresso/score) |
 | [flutter_plugin_android_lifecycle](./packages/flutter_plugin_android_lifecycle/) | [![pub package](https://img.shields.io/pub/v/flutter_plugin_android_lifecycle.svg)](https://pub.dev/packages/flutter_plugin_android_lifecycle) | [![pub points](https://badges.bar/flutter_plugin_android_lifecycle/pub%20points)](https://pub.dev/packages/flutter_plugin_android_lifecycle/score) | [![popularity](https://badges.bar/flutter_plugin_android_lifecycle/popularity)](https://pub.dev/packages/flutter_plugin_android_lifecycle/score) | [![likes](https://badges.bar/flutter_plugin_android_lifecycle/likes)](https://pub.dev/packages/flutter_plugin_android_lifecycle/score) |
 | [google_maps_flutter](./packages/google_maps_flutter) | [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dev/packages/google_maps_flutter) | [![pub points](https://badges.bar/google_maps_flutter/pub%20points)](https://pub.dev/packages/google_maps_flutter/score) | [![popularity](https://badges.bar/google_maps_flutter/popularity)](https://pub.dev/packages/google_maps_flutter/score) | [![likes](https://badges.bar/google_maps_flutter/likes)](https://pub.dev/packages/google_maps_flutter/score) |
 | [google_sign_in](./packages/google_sign_in/) | [![pub package](https://img.shields.io/pub/v/google_sign_in.svg)](https://pub.dev/packages/google_sign_in) | [![pub points](https://badges.bar/google_sign_in/pub%20points)](https://pub.dev/packages/google_sign_in/score) | [![popularity](https://badges.bar/google_sign_in/popularity)](https://pub.dev/packages/google_sign_in/score) | [![likes](https://badges.bar/google_sign_in/likes)](https://pub.dev/packages/google_sign_in/score) |
 | [image_picker](./packages/image_picker/) | [![pub package](https://img.shields.io/pub/v/image_picker.svg)](https://pub.dev/packages/image_picker) | [![pub points](https://badges.bar/image_picker/pub%20points)](https://pub.dev/packages/image_picker/score) | [![popularity](https://badges.bar/image_picker/popularity)](https://pub.dev/packages/image_picker/score) | [![likes](https://badges.bar/image_picker/likes)](https://pub.dev/packages/image_picker/score) |
-| [integration_test](./packages/integration_test/) | [![pub package](https://img.shields.io/pub/v/integration_test.svg)](https://pub.dev/packages/integration_test) | [![pub points](https://badges.bar/integration_test/pub%20points)](https://pub.dev/packages/integration_test/score) | [![popularity](https://badges.bar/integration_test/popularity)](https://pub.dev/packages/integration_test/score) | [![likes](https://badges.bar/integration_test/likes)](https://pub.dev/packages/integration_test/score) |
+| [integration_test (discontinued)](./packages/integration_test/) | [![pub package](https://img.shields.io/pub/v/integration_test.svg)](https://pub.dev/packages/integration_test) | [![pub points](https://badges.bar/integration_test/pub%20points)](https://pub.dev/packages/integration_test/score) | [![popularity](https://badges.bar/integration_test/popularity)](https://pub.dev/packages/integration_test/score) | [![likes](https://badges.bar/integration_test/likes)](https://pub.dev/packages/integration_test/score) |
 | [in_app_purchase](./packages/in_app_purchase/) | [![pub package](https://img.shields.io/pub/v/in_app_purchase.svg)](https://pub.dev/packages/in_app_purchase) | [![pub points](https://badges.bar/in_app_purchase/pub%20points)](https://pub.dev/packages/in_app_purchase/score) | [![popularity](https://badges.bar/in_app_purchase/popularity)](https://pub.dev/packages/in_app_purchase/score) | [![likes](https://badges.bar/in_app_purchase/likes)](https://pub.dev/packages/in_app_purchase/score) |
 | [ios_platform_images](./packages/ios_platform_images/) | [![pub package](https://img.shields.io/pub/v/ios_platform_images.svg)](https://pub.dev/packages/ios_platform_images) | [![pub points](https://badges.bar/ios_platform_images/pub%20points)](https://pub.dev/packages/ios_platform_images/score) | [![popularity](https://badges.bar/ios_platform_images/popularity)](https://pub.dev/packages/ios_platform_images/score) | [![likes](https://badges.bar/ios_platform_images/likes)](https://pub.dev/packages/ios_platform_images/score) |
 | [local_auth](./packages/local_auth/) | [![pub package](https://img.shields.io/pub/v/local_auth.svg)](https://pub.dev/packages/local_auth) | [![pub points](https://badges.bar/local_auth/pub%20points)](https://pub.dev/packages/local_auth/score) | [![popularity](https://badges.bar/local_auth/popularity)](https://pub.dev/packages/local_auth/score) | [![likes](https://badges.bar/local_auth/likes)](https://pub.dev/packages/local_auth/score) |

diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
     path: ../
   shared_preferences: ^2.0.0
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   path_provider: ^2.0.0
 
 dev_dependencies:

diff --git a/packages/android_intent/example/pubspec.yaml b/packages/android_intent/example/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
   pedantic: ^1.10.0

diff --git a/packages/battery/battery/example/pubspec.yaml b/packages/battery/battery/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/battery/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml
@@ -24,7 +24,7 @@ dev_dependencies:
     sdk: flutter
   plugin_platform_interface: ^2.0.0
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
   test: ^1.16.3
 

diff --git a/packages/camera/camera/example/pubspec.yaml b/packages/camera/camera/example/pubspec.yaml
@@ -20,7 +20,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/connectivity/connectivity/example/pubspec.yaml b/packages/connectivity/connectivity/example/pubspec.yaml
@@ -17,7 +17,7 @@ dev_dependencies:
     sdk: flutter
   test: ^1.16.3
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml
@@ -32,7 +32,7 @@ dev_dependencies:
     sdk: flutter
   test: ^1.16.3
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   plugin_platform_interface: ^2.0.0
   pedantic: ^1.10.0
 

diff --git a/packages/connectivity/connectivity_macos/example/pubspec.yaml b/packages/connectivity/connectivity_macos/example/pubspec.yaml
@@ -17,7 +17,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/device_info/device_info/example/pubspec.yaml b/packages/device_info/device_info/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   flutter_test:
     sdk: flutter
   pedantic: ^1.8.0

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
@@ -23,7 +23,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/google_sign_in/google_sign_in/example/pubspec.yaml b/packages/google_sign_in/google_sign_in/example/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
 dev_dependencies:
   pedantic: ^1.10.0
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
 

diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml
@@ -30,7 +30,7 @@ dev_dependencies:
     sdk: flutter
   pedantic: ^1.10.0
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
 
 environment:
   sdk: ">=2.12.0-259.9.beta <3.0.0"

diff --git a/packages/image_picker/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml
@@ -19,7 +19,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
@@ -26,7 +26,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   mockito: ^5.0.0-nullsafety.7
   pedantic: ^1.10.0
   plugin_platform_interface: ^2.0.0

diff --git a/packages/in_app_purchase/example/pubspec.yaml b/packages/in_app_purchase/example/pubspec.yaml
@@ -18,7 +18,7 @@ dev_dependencies:
     # the parent directory to use the current plugin's version.
     path: ../
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
@@ -19,7 +19,7 @@ dev_dependencies:
     sdk: flutter
   test: ^1.16.0
   integration_test:
-    path: ../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/integration_test/CHANGELOG.md b/packages/integration_test/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.2+3
+
+* Update README to reflect deprecation.
+
 ## 1.0.2+2
 
 * Fix tests from changes to `flutter test` machine output.

diff --git a/packages/integration_test/README.md b/packages/integration_test/README.md
@@ -1,4 +1,17 @@
-# integration_test
+# integration_test (deprecated)
+
+## DEPRECATED
+
+This package has been moved to the Flutter SDK. Starting with Flutter 2.0,
+it should be included as:
+
+```
+dev_dependencies:
+  integration_test:
+    sdk: flutter
+```
+
+## Old instructions
 
 This package enables self-driving testing of Flutter code on devices and emulators.
 It adapts flutter_test results into a format that is compatible with `flutter drive`

diff --git a/packages/integration_test/pubspec.yaml b/packages/integration_test/pubspec.yaml
@@ -1,6 +1,6 @@
 name: integration_test
 description: Runs tests that use the flutter_test API as integration tests.
-version: 1.0.2+2
+version: 1.0.2+3
 homepage: https://github.com/flutter/plugins/tree/master/packages/integration_test
 
 environment:

diff --git a/packages/local_auth/example/pubspec.yaml b/packages/local_auth/example/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
   pedantic: ^1.10.0

diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
   flutter_test:

diff --git a/packages/package_info/example/pubspec.yaml b/packages/package_info/example/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
     # the parent directory to use the current plugin's version.
     path: ../
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
 
 dev_dependencies:
   flutter_driver:

diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
@@ -25,7 +25,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 environment:

diff --git a/packages/path_provider/path_provider/example/pubspec.yaml b/packages/path_provider/path_provider/example/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
   pedantic: ^1.10.0

diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml
@@ -28,7 +28,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   flutter_test:
     sdk: flutter
   flutter_driver:

diff --git a/packages/path_provider/path_provider_linux/example/pubspec.yaml b/packages/path_provider/path_provider_linux/example/pubspec.yaml
@@ -24,7 +24,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
 
 flutter:
   uses-material-design: true
diff --git a/packages/path_provider/path_provider_macos/example/pubspec.yaml b/packages/path_provider/path_provider_macos/example/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
   pedantic: ^1.8.0

diff --git a/packages/path_provider/path_provider_windows/example/pubspec.yaml b/packages/path_provider/path_provider_windows/example/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   flutter_driver:
     sdk: flutter
   pedantic: ^1.10.0

diff --git a/packages/quick_actions/example/pubspec.yaml b/packages/quick_actions/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml
@@ -23,7 +23,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   integration_test:
-    path: ../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 environment:

diff --git a/packages/sensors/example/pubspec.yaml b/packages/sensors/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml
@@ -22,7 +22,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   integration_test:
-    path: ../integration_test
+    sdk: flutter
   mockito: ^5.0.0-nullsafety.0
   pedantic: ^1.10.0
 

diff --git a/packages/share/example/pubspec.yaml b/packages/share/example/pubspec.yaml
@@ -17,7 +17,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml
@@ -23,7 +23,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   integration_test:
-    path: ../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 environment:

diff --git a/packages/shared_preferences/shared_preferences/example/pubspec.yaml b/packages/shared_preferences/shared_preferences/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml
@@ -42,7 +42,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 environment:

diff --git a/packages/shared_preferences/shared_preferences_linux/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_linux/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/shared_preferences/shared_preferences_macos/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/example/pubspec.yaml
@@ -17,7 +17,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:

diff --git a/packages/shared_preferences/shared_preferences_windows/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_windows/example/pubspec.yaml
@@ -23,7 +23,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter: