diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml index 669a52ef70..3f4ab1f368 100644 --- a/dev/automated_tests/pubspec.yaml +++ b/dev/automated_tests/pubspec.yaml @@ -10,15 +10,8 @@ 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 diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index b7aea3bf78..5b80a7cb93 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -10,14 +10,6 @@ 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 @@ -48,6 +40,8 @@ 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" diff --git a/dev/benchmarks/macrobenchmarks/pubspec.yaml b/dev/benchmarks/macrobenchmarks/pubspec.yaml index d78587eea2..ee887f00fe 100644 --- a/dev/benchmarks/macrobenchmarks/pubspec.yaml +++ b/dev/benchmarks/macrobenchmarks/pubspec.yaml @@ -47,12 +47,6 @@ 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 diff --git a/dev/integration_tests/android_semantics_testing/pubspec.yaml b/dev/integration_tests/android_semantics_testing/pubspec.yaml index ec6c2d97d7..9ccd4a836f 100644 --- a/dev/integration_tests/android_semantics_testing/pubspec.yaml +++ b/dev/integration_tests/android_semantics_testing/pubspec.yaml @@ -6,15 +6,8 @@ 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 diff --git a/dev/integration_tests/channels/pubspec.yaml b/dev/integration_tests/channels/pubspec.yaml index 45d4afc9e6..c5d2513da2 100644 --- a/dev/integration_tests/channels/pubspec.yaml +++ b/dev/integration_tests/channels/pubspec.yaml @@ -8,14 +8,6 @@ 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" @@ -23,6 +15,8 @@ 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: diff --git a/dev/integration_tests/flavors/pubspec.yaml b/dev/integration_tests/flavors/pubspec.yaml index 031a5a27aa..a60e827d3d 100644 --- a/dev/integration_tests/flavors/pubspec.yaml +++ b/dev/integration_tests/flavors/pubspec.yaml @@ -9,15 +9,8 @@ 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" diff --git a/dev/integration_tests/flutter_gallery/pubspec.yaml b/dev/integration_tests/flutter_gallery/pubspec.yaml index 742195b8fc..5d3575fbea 100644 --- a/dev/integration_tests/flutter_gallery/pubspec.yaml +++ b/dev/integration_tests/flutter_gallery/pubspec.yaml @@ -15,14 +15,6 @@ 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 @@ -59,6 +51,8 @@ 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" diff --git a/dev/integration_tests/release_smoke_test/pubspec.yaml b/dev/integration_tests/release_smoke_test/pubspec.yaml index 38b90de391..a1571a69b5 100644 --- a/dev/integration_tests/release_smoke_test/pubspec.yaml +++ b/dev/integration_tests/release_smoke_test/pubspec.yaml @@ -7,14 +7,6 @@ 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" @@ -24,6 +16,8 @@ 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" diff --git a/dev/integration_tests/spell_check/pubspec.yaml b/dev/integration_tests/spell_check/pubspec.yaml index 4cb741afc5..b044f8e7cd 100644 --- a/dev/integration_tests/spell_check/pubspec.yaml +++ b/dev/integration_tests/spell_check/pubspec.yaml @@ -30,14 +30,6 @@ 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 @@ -52,6 +44,10 @@ 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 diff --git a/dev/integration_tests/ui/pubspec.yaml b/dev/integration_tests/ui/pubspec.yaml index 9c25630dc4..7ec3b40599 100644 --- a/dev/integration_tests/ui/pubspec.yaml +++ b/dev/integration_tests/ui/pubspec.yaml @@ -9,15 +9,8 @@ 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" diff --git a/dev/integration_tests/web_e2e_tests/pubspec.yaml b/dev/integration_tests/web_e2e_tests/pubspec.yaml index 9bd9978895..3c6de2b5bf 100644 --- a/dev/integration_tests/web_e2e_tests/pubspec.yaml +++ b/dev/integration_tests/web_e2e_tests/pubspec.yaml @@ -18,15 +18,8 @@ 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 diff --git a/dev/integration_tests/wide_gamut_test/pubspec.yaml b/dev/integration_tests/wide_gamut_test/pubspec.yaml index 6a332527da..a2f08a912c 100644 --- a/dev/integration_tests/wide_gamut_test/pubspec.yaml +++ b/dev/integration_tests/wide_gamut_test/pubspec.yaml @@ -11,14 +11,6 @@ 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" @@ -28,6 +20,8 @@ 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" diff --git a/examples/api/pubspec.yaml b/examples/api/pubspec.yaml index 6849420fc6..4117ee7820 100644 --- a/examples/api/pubspec.yaml +++ b/examples/api/pubspec.yaml @@ -15,14 +15,6 @@ 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" @@ -30,6 +22,8 @@ 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: diff --git a/packages/integration_test/example/pubspec.yaml b/packages/integration_test/example/pubspec.yaml index e14816ed67..719c4012ff 100644 --- a/packages/integration_test/example/pubspec.yaml +++ b/packages/integration_test/example/pubspec.yaml @@ -10,16 +10,6 @@ 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 @@ -34,6 +24,10 @@ 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