Skip to content

Commit 3762f2e

Browse files
authored
Revert: "Move integration_test dependencies to non-dev_dependencies." (#160980)
Reverts flutter/flutter#160380; this ended up not being needed. Closes flutter/flutter#160379.
1 parent ec66fe4 commit 3762f2e

File tree

14 files changed

+20
-107
lines changed

14 files changed

+20
-107
lines changed

dev/automated_tests/pubspec.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,8 @@ dependencies:
1010
sdk: flutter
1111
flutter_goldens:
1212
sdk: flutter
13-
14-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
15-
#
16-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
17-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
18-
# expect integration_test to never be removed.
1913
integration_test:
2014
sdk: flutter
21-
2215
platform: 3.1.6
2316
test: 1.25.12
2417

dev/benchmarks/complex_layout/pubspec.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ dependencies:
1010
flutter_driver:
1111
sdk: flutter
1212

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

5246
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5347
analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev/benchmarks/macrobenchmarks/pubspec.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ dependencies:
4747

4848
dev_dependencies:
4949
test: 1.25.12
50-
51-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
52-
#
53-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
54-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
55-
# expect integration_test to never be removed.
5650
integration_test:
5751
sdk: flutter
5852

dev/integration_tests/android_semantics_testing/pubspec.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@ environment:
66
dependencies:
77
flutter:
88
sdk: flutter
9-
10-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
11-
#
12-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
13-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
14-
# expect integration_test to never be removed.
159
integration_test:
1610
sdk: flutter
17-
1811
flutter_test:
1912
sdk: flutter
2013
pub_semver: 2.1.5

dev/integration_tests/channels/pubspec.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,15 @@ dependencies:
88
flutter:
99
sdk: flutter
1010

11-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
12-
#
13-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
14-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
15-
# expect integration_test to never be removed.
16-
integration_test:
17-
sdk: flutter
18-
1911
characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2012
collection: 1.19.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2113
material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2214
meta: 1.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2315
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2416

2517
dev_dependencies:
18+
integration_test:
19+
sdk: flutter
2620
flutter_driver:
2721
sdk: flutter
2822
flutter_test:

dev/integration_tests/flavors/pubspec.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ dependencies:
99
sdk: flutter
1010
flutter_driver:
1111
sdk: flutter
12-
13-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
14-
#
15-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
16-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
17-
# expect integration_test to never be removed.
1812
integration_test:
1913
sdk: flutter
20-
2114
test: 1.25.12
2215

2316
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev/integration_tests/flutter_gallery/pubspec.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ dependencies:
1515
scoped_model: 2.0.0
1616
shrine_images: 2.0.2
1717

18-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
19-
#
20-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
21-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
22-
# expect integration_test to never be removed.
23-
integration_test:
24-
sdk: flutter
25-
2618
# Also update dev/benchmarks/complex_layout/pubspec.yaml
2719
# and dev/benchmarks/macrobenchmarks/pubspec.yaml
2820
flutter_gallery_assets: 1.0.2
@@ -59,6 +51,8 @@ dev_dependencies:
5951
flutter_goldens:
6052
sdk: flutter
6153
test: 1.25.12
54+
integration_test:
55+
sdk: flutter
6256

6357
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6458
analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev/integration_tests/release_smoke_test/pubspec.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ dependencies:
77
flutter:
88
sdk: flutter
99

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

2822
async: 2.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2923
boolean_selector: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev/integration_tests/spell_check/pubspec.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ dependencies:
3030
flutter:
3131
sdk: flutter
3232

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

47+
# Used to run the integration tests in this app:
48+
integration_test:
49+
sdk: flutter
50+
5551
# For information on the generic Dart part of this file, see the
5652
# following page: https://dart.dev/tools/pub/pubspec
5753

dev/integration_tests/ui/pubspec.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ dependencies:
99
sdk: flutter
1010
flutter_driver:
1111
sdk: flutter
12-
13-
# TODO(matanlurey): Move to dev_dependencies (https://github.com/flutter/flutter/issues/160379).
14-
#
15-
# As part of https://github.com/flutter/flutter/issues/160257, integration_test as a dev_dependency
16-
# will be removed in release mode, but some of our tests and CI tasks are written in a way where they
17-
# expect integration_test to never be removed.
1812
integration_test:
1913
sdk: flutter
20-
2114
test: 1.25.12
2215

2316
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

0 commit comments

Comments
 (0)