Skip to content

Revert workaround #2316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2025
Merged

Revert workaround #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af16dbc
Revert workaround
domesticmouse May 27, 2025
ecac9ff
Merge branch 'main' into revert-workaround
domesticmouse May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions colorist/codelab_rebuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,20 +123,6 @@ steps:
- name: Add Firebase AI Logic dependencies
path: colorist
flutter: pub add firebase_core firebase_ai
- name: Workaround https://github.com/dart-lang/sdk/issues/60784
path: colorist/pubspec.yaml
patch-u: |
--- b/colorist/step_02/pubspec.yaml
+++ a/colorist/step_02/pubspec.yaml
@@ -25,5 +25,8 @@ dev_dependencies:
json_serializable: ^6.9.5
custom_lint: ^0.7.5

+dependency_overrides:
+ custom_lint_visitor: 1.0.0+7.3.0
+
flutter:
uses-material-design: true
- name: Add lib/firebase_options.dart
path: colorist/lib/firebase_options.dart
replace-contents: |
Expand Down Expand Up @@ -468,7 +454,7 @@ steps:
patch-u: |
--- b/colorist/step_03/pubspec.yaml
+++ a/colorist/step_03/pubspec.yaml
@@ -30,3 +30,6 @@ dependency_overrides:
@@ -27,3 +27,6 @@ dev_dependencies:

flutter:
uses-material-design: true
Expand Down
2 changes: 1 addition & 1 deletion colorist/step_01/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
Expand Down
5 changes: 1 addition & 4 deletions colorist/step_02/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
json_serializable: ^6.9.5
custom_lint: ^0.7.5

dependency_overrides:
custom_lint_visitor: 1.0.0+7.3.0

flutter:
uses-material-design: true
5 changes: 1 addition & 4 deletions colorist/step_03/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
json_serializable: ^6.9.5
custom_lint: ^0.7.5

dependency_overrides:
custom_lint_visitor: 1.0.0+7.3.0

flutter:
uses-material-design: true

Expand Down
5 changes: 1 addition & 4 deletions colorist/step_04/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
json_serializable: ^6.9.5
custom_lint: ^0.7.5

dependency_overrides:
custom_lint_visitor: 1.0.0+7.3.0

flutter:
uses-material-design: true

Expand Down
5 changes: 1 addition & 4 deletions colorist/step_05/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
json_serializable: ^6.9.5
custom_lint: ^0.7.5

dependency_overrides:
custom_lint_visitor: 1.0.0+7.3.0

flutter:
uses-material-design: true

Expand Down
5 changes: 1 addition & 4 deletions colorist/step_06/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
json_serializable: ^6.9.5
custom_lint: ^0.7.5

dependency_overrides:
custom_lint_visitor: 1.0.0+7.3.0

flutter:
uses-material-design: true

Expand Down
5 changes: 1 addition & 4 deletions colorist/step_07/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
build_runner: ^2.4.15
riverpod_generator: ^2.6.5
riverpod_lint: ^2.6.5
json_serializable: ^6.9.5
custom_lint: ^0.7.5

dependency_overrides:
custom_lint_visitor: 1.0.0+7.3.0

flutter:
uses-material-design: true

Expand Down