Move integration_test dependencies to non-dev_dependencies. (#160380)

First part of https://github.com/flutter/flutter/issues/160379. This should be a NOP, because without the `explicit-package-dependencies` feature flag, all dependencies (including dev_dependencies) are considered, for the purposes of plugins, non-dev dependencies. This change prepares for flipping that flag, so when the flip occurs, it is _also_ a NOP for these tests.
2024-12-16 14:42:01 -08:00 · 2024-12-16 14:42:01 -08:00 · 256ad9f9cb
commit 256ad9f9cb
parent 71f140ee16
14 changed files with 107 additions and 20 deletions
--- a/dev/automated_tests/pubspec.yaml
+++ b/dev/automated_tests/pubspec.yaml
@ -10,8 +10,15 @@ dependencies:
    sdk: flutter
  flutter_goldens:
    sdk: flutter
+
+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
  integration_test:
    sdk: flutter
+
  platform: 3.1.6
  test: 1.25.12

--- a/dev/benchmarks/complex_layout/pubspec.yaml
+++ b/dev/benchmarks/complex_layout/pubspec.yaml
@ -10,6 +10,14 @@ dependencies:
  flutter_driver:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  # To change the version of the gallery assets, edit
  #   //packages/flutter_tools/lib/src/commands/update_packages.dart
  # and run
@ -40,8 +48,6 @@ dev_dependencies:
  flutter_test:
    sdk: flutter
  test: 1.25.12
-  integration_test:
-    sdk: flutter

  _fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
--- a/dev/benchmarks/macrobenchmarks/pubspec.yaml
+++ b/dev/benchmarks/macrobenchmarks/pubspec.yaml
@ -47,6 +47,12 @@ dependencies:

 dev_dependencies:
  test: 1.25.12
+
+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
  integration_test:
    sdk: flutter

--- a/dev/integration_tests/android_semantics_testing/pubspec.yaml
+++ b/dev/integration_tests/android_semantics_testing/pubspec.yaml
@ -6,8 +6,15 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
+
+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
  integration_test:
    sdk: flutter
+
  flutter_test:
    sdk: flutter
  pub_semver: 2.1.5
--- a/dev/integration_tests/channels/pubspec.yaml
+++ b/dev/integration_tests/channels/pubspec.yaml
@ -8,6 +8,14 @@ dependencies:
  flutter:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  collection: 1.19.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@ -15,8 +23,6 @@ dependencies:
  vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

 dev_dependencies:
-  integration_test:
-    sdk: flutter
  flutter_driver:
    sdk: flutter
  flutter_test:
--- a/dev/integration_tests/flavors/pubspec.yaml
+++ b/dev/integration_tests/flavors/pubspec.yaml
@ -9,8 +9,15 @@ dependencies:
    sdk: flutter
  flutter_driver:
    sdk: flutter
+
+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
  integration_test:
    sdk: flutter
+
  test: 1.25.12

  _fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
--- a/dev/integration_tests/flutter_gallery/pubspec.yaml
+++ b/dev/integration_tests/flutter_gallery/pubspec.yaml
@ -15,6 +15,14 @@ dependencies:
  scoped_model: 2.0.0
  shrine_images: 2.0.2

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  # Also update dev/benchmarks/complex_layout/pubspec.yaml
  # and dev/benchmarks/macrobenchmarks/pubspec.yaml
  flutter_gallery_assets: 1.0.2
@ -51,8 +59,6 @@ dev_dependencies:
  flutter_goldens:
    sdk: flutter
  test: 1.25.12
-  integration_test:
-    sdk: flutter

  _fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
--- a/dev/integration_tests/release_smoke_test/pubspec.yaml
+++ b/dev/integration_tests/release_smoke_test/pubspec.yaml
@ -7,6 +7,14 @@ dependencies:
  flutter:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  collection: 1.19.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@ -16,8 +24,6 @@ dependencies:
 dev_dependencies:
  flutter_test:
    sdk: flutter
-  integration_test:
-    sdk: flutter

  async: 2.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  boolean_selector: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
--- a/dev/integration_tests/spell_check/pubspec.yaml
+++ b/dev/integration_tests/spell_check/pubspec.yaml
@ -30,6 +30,14 @@ dependencies:
  flutter:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.
  cupertino_icons: 1.0.8
@ -44,10 +52,6 @@ dev_dependencies:
  flutter_test:
    sdk: flutter

-  # Used to run the integration tests in this app:
-  integration_test:
-    sdk: flutter
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

--- a/dev/integration_tests/ui/pubspec.yaml
+++ b/dev/integration_tests/ui/pubspec.yaml
@ -9,8 +9,15 @@ dependencies:
    sdk: flutter
  flutter_driver:
    sdk: flutter
+
+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
  integration_test:
    sdk: flutter
+
  test: 1.25.12

  _fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
--- a/dev/integration_tests/web_e2e_tests/pubspec.yaml
+++ b/dev/integration_tests/web_e2e_tests/pubspec.yaml
@ -18,8 +18,15 @@ dependencies:
    sdk: flutter
  flutter_web_plugins:
    sdk: flutter
+
+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
  integration_test:
    sdk: flutter
+
  flutter_gallery_assets: 1.0.2
  web: 1.1.0

--- a/dev/integration_tests/wide_gamut_test/pubspec.yaml
+++ b/dev/integration_tests/wide_gamut_test/pubspec.yaml
@ -11,6 +11,14 @@ dependencies:
  flutter:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  collection: 1.19.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@ -20,8 +28,6 @@ dependencies:
 dev_dependencies:
  flutter_test:
    sdk: flutter
-  integration_test:
-    sdk: flutter

  async: 2.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  boolean_selector: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
--- a/examples/api/pubspec.yaml
+++ b/examples/api/pubspec.yaml
@ -15,6 +15,14 @@ dependencies:
  flutter:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+
  characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  collection: 1.19.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@ -22,8 +30,6 @@ dependencies:
  vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

 dev_dependencies:
-  integration_test:
-    sdk: flutter
  flutter_driver:
    sdk: flutter
  flutter_goldens:
--- a/packages/integration_test/example/pubspec.yaml
+++ b/packages/integration_test/example/pubspec.yaml
@ -10,6 +10,16 @@ dependencies:
  flutter:
    sdk: flutter

+  # TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
+  #
+  # As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
+  # will be removed in release mode, but some of our tests and CI tasks are written in a way where they
+  # expect integration_test to never be removed.
+  integration_test:
+    sdk: flutter
+  integration_test_macos:
+    path: ../integration_test_macos
+
  cupertino_icons: 1.0.8
  web: 1.1.0

@ -24,10 +34,6 @@ dev_dependencies:
    sdk: flutter
  flutter_driver:
    sdk: flutter
-  integration_test:
-    sdk: flutter
-  integration_test_macos:
-    path: ../integration_test_macos
  test: 1.25.12
  pedantic: 1.11.1