Skip to content

Commit 5aebbbe

Browse files
Revert workaround (#2316)
Reverting #2315 ## Pre-launch Checklist - [x] I read the [Effective Dart: Style] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-devrel channel on [Discord]. <!-- Links --> [Effective Dart: Style]: https://dart.dev/guides/language/effective-dart/style [CLA]: https://cla.developers.google.com/ [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
1 parent de56cc9 commit 5aebbbe

File tree

8 files changed

+8
-40
lines changed

8 files changed

+8
-40
lines changed

colorist/codelab_rebuild.yaml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,6 @@ steps:
123123
- name: Add Firebase AI Logic dependencies
124124
path: colorist
125125
flutter: pub add firebase_core firebase_ai
126-
- name: Workaround https://github.com/dart-lang/sdk/issues/60784
127-
path: colorist/pubspec.yaml
128-
patch-u: |
129-
--- b/colorist/step_02/pubspec.yaml
130-
+++ a/colorist/step_02/pubspec.yaml
131-
@@ -25,5 +25,8 @@ dev_dependencies:
132-
json_serializable: ^6.9.5
133-
custom_lint: ^0.7.5
134-
135-
+dependency_overrides:
136-
+ custom_lint_visitor: 1.0.0+7.3.0
137-
+
138-
flutter:
139-
uses-material-design: true
140126
- name: Add lib/firebase_options.dart
141127
path: colorist/lib/firebase_options.dart
142128
replace-contents: |
@@ -468,7 +454,7 @@ steps:
468454
patch-u: |
469455
--- b/colorist/step_03/pubspec.yaml
470456
+++ a/colorist/step_03/pubspec.yaml
471-
@@ -30,3 +30,6 @@ dependency_overrides:
457+
@@ -27,3 +27,6 @@ dev_dependencies:
472458
473459
flutter:
474460
uses-material-design: true

colorist/step_01/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
dev_dependencies:
1717
flutter_test:
1818
sdk: flutter
19-
flutter_lints: ^5.0.0
19+
flutter_lints: ^6.0.0
2020
build_runner: ^2.4.15
2121
riverpod_generator: ^2.6.5
2222
riverpod_lint: ^2.6.5

colorist/step_02/pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^6.0.0
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
2525
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

28-
dependency_overrides:
29-
custom_lint_visitor: 1.0.0+7.3.0
30-
3128
flutter:
3229
uses-material-design: true

colorist/step_03/pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^6.0.0
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
2525
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

28-
dependency_overrides:
29-
custom_lint_visitor: 1.0.0+7.3.0
30-
3128
flutter:
3229
uses-material-design: true
3330

colorist/step_04/pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^6.0.0
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
2525
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

28-
dependency_overrides:
29-
custom_lint_visitor: 1.0.0+7.3.0
30-
3128
flutter:
3229
uses-material-design: true
3330

colorist/step_05/pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^6.0.0
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
2525
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

28-
dependency_overrides:
29-
custom_lint_visitor: 1.0.0+7.3.0
30-
3128
flutter:
3229
uses-material-design: true
3330

colorist/step_06/pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^6.0.0
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
2525
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

28-
dependency_overrides:
29-
custom_lint_visitor: 1.0.0+7.3.0
30-
3128
flutter:
3229
uses-material-design: true
3330

colorist/step_07/pubspec.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^6.0.0
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
2525
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

28-
dependency_overrides:
29-
custom_lint_visitor: 1.0.0+7.3.0
30-
3128
flutter:
3229
uses-material-design: true
3330

0 commit comments

Comments
 (0)