From dbec178a7564f7ccec1aec69a7666419c05c4cfd Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Fri, 25 Oct 2024 06:02:46 +1100 Subject: [PATCH] Fixup `generate_crossword` (#2254) --- generate_crossword/codelab_rebuild.yaml | 65 ++++++++++--------- .../step_02/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_02/android/settings.gradle | 4 +- generate_crossword/step_02/pubspec.yaml | 18 ++--- .../step_03/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_03/android/settings.gradle | 4 +- generate_crossword/step_03/lib/providers.dart | 3 +- .../step_03/lib/providers.g.dart | 6 +- generate_crossword/step_03/pubspec.yaml | 18 ++--- .../step_04/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_04/android/settings.gradle | 4 +- generate_crossword/step_04/lib/providers.dart | 5 +- .../step_04/lib/providers.g.dart | 10 ++- generate_crossword/step_04/pubspec.yaml | 18 ++--- .../step_05_a/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_05_a/android/settings.gradle | 4 +- .../step_05_a/lib/providers.dart | 5 +- .../step_05_a/lib/providers.g.dart | 10 ++- generate_crossword/step_05_a/pubspec.yaml | 18 ++--- .../step_05_b/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_05_b/android/settings.gradle | 4 +- .../step_05_b/lib/providers.dart | 5 +- .../step_05_b/lib/providers.g.dart | 10 ++- generate_crossword/step_05_b/pubspec.yaml | 18 ++--- .../step_05_c/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_05_c/android/settings.gradle | 4 +- .../step_05_c/lib/providers.dart | 5 +- .../step_05_c/lib/providers.g.dart | 10 ++- generate_crossword/step_05_c/pubspec.yaml | 18 ++--- .../step_06/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_06/android/settings.gradle | 4 +- generate_crossword/step_06/lib/providers.dart | 5 +- .../step_06/lib/providers.g.dart | 10 ++- generate_crossword/step_06/pubspec.yaml | 18 ++--- .../step_07/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_07/android/settings.gradle | 4 +- generate_crossword/step_07/lib/providers.dart | 7 +- .../step_07/lib/providers.g.dart | 14 ++-- generate_crossword/step_07/pubspec.yaml | 18 ++--- .../step_08/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_08/android/settings.gradle | 4 +- generate_crossword/step_08/lib/providers.dart | 7 +- .../step_08/lib/providers.g.dart | 14 ++-- generate_crossword/step_08/pubspec.yaml | 18 ++--- .../step_09/analysis_options.yaml | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../step_09/android/settings.gradle | 4 +- generate_crossword/step_09/lib/providers.dart | 5 +- .../step_09/lib/providers.g.dart | 10 ++- generate_crossword/step_09/pubspec.yaml | 18 ++--- 59 files changed, 269 insertions(+), 197 deletions(-) diff --git a/generate_crossword/codelab_rebuild.yaml b/generate_crossword/codelab_rebuild.yaml index 33c9102122..8069e642a9 100644 --- a/generate_crossword/codelab_rebuild.yaml +++ b/generate_crossword/codelab_rebuild.yaml @@ -19,6 +19,8 @@ steps: analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: @@ -199,13 +201,14 @@ steps: import 'package:built_collection/built_collection.dart'; import 'package:flutter/services.dart'; + import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod - Future> wordList(WordListRef ref) async { + Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -49373,24 +49376,25 @@ steps: patch: | --- b/generate_crossword/step_04/lib/providers.dart +++ a/generate_crossword/step_04/lib/providers.dart - @@ -3,11 +3,16 @@ + @@ -3,12 +3,17 @@ // found in the LICENSE file. - + import 'dart:convert'; +import 'dart:math'; - + import 'package:built_collection/built_collection.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; + import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; - + +import 'model.dart' as model; +import 'utils.dart'; + part 'providers.g.dart'; - + /// A provider for the wordlist to use when generating the crossword. - @@ -25,3 +30,72 @@ Future> wordList(WordListRef ref) async { + @@ -26,3 +31,72 @@ Future> wordList(Ref ref) async { ..where((word) => word.length > 2) ..where((word) => re.hasMatch(word))); } @@ -49430,7 +49434,7 @@ steps: +final _random = Random(); + +@riverpod - +Stream crossword(CrosswordRef ref) async* { + +Stream crossword(Ref ref) async* { + final size = ref.watch(sizeProvider); + final wordListAsync = ref.watch(wordListProvider); + @@ -50174,7 +50178,7 @@ steps: patch: | --- b/generate_crossword/step_05_a/lib/providers.dart +++ a/generate_crossword/step_05_a/lib/providers.dart - @@ -82,10 +82,16 @@ Stream crossword(CrosswordRef ref) async* { + @@ -83,10 +83,16 @@ Stream crossword(Ref ref) async* { final location = model.Location.at( _random.nextInt(size.width), _random.nextInt(size.height)); @@ -50232,7 +50236,7 @@ steps: patch: | --- b/generate_crossword/step_05_b/lib/providers.dart +++ a/generate_crossword/step_05_b/lib/providers.dart - @@ -81,16 +81,20 @@ Stream crossword(CrosswordRef ref) async* { + @@ -82,16 +82,20 @@ Stream crossword(Ref ref) async* { _random.nextBool() ? model.Direction.across : model.Direction.down; final location = model.Location.at( _random.nextInt(size.width), _random.nextInt(size.height)); @@ -50343,7 +50347,7 @@ steps: patch: | --- b/generate_crossword/step_05_c/lib/providers.dart +++ a/generate_crossword/step_05_c/lib/providers.dart - @@ -3,15 +3,14 @@ + @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'dart:convert'; @@ -50351,7 +50355,8 @@ steps: import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; - import 'package:flutter/services.dart'; + @@ -11,8 +10,8 @@ import 'package:flutter/services.dart'; + import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; +import 'isolates.dart'; @@ -50360,14 +50365,14 @@ steps: part 'providers.g.dart'; - @@ -63,49 +62,25 @@ class Size extends _$Size { + @@ -64,49 +63,25 @@ class Size extends _$Size { } } -final _random = Random(); - @riverpod - Stream crossword(CrosswordRef ref) async* { + Stream crossword(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); @@ -50950,12 +50955,12 @@ steps: import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; - @@ -63,12 +64,19 @@ class Size extends _$Size { + @@ -64,12 +65,19 @@ class Size extends _$Size { } @riverpod - -Stream crossword(CrosswordRef ref) async* { - +Stream workQueue(WorkQueueRef ref) async* { + -Stream crossword(Ref ref) async* { + +Stream workQueue(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); - @@ -50972,7 +50977,7 @@ steps: yield* wordListAsync.when( data: (wordList) => exploreCrosswordSolutions( - @@ -77,10 +85,100 @@ Stream crossword(CrosswordRef ref) async* { + @@ -78,10 +86,100 @@ Stream crossword(Ref ref) async* { ), error: (error, stackTrace) async* { debugPrint('Error loading word list: $error'); @@ -51022,7 +51027,7 @@ steps: +const _estimatedTotalCoverage = 0.54; + +@riverpod - +Duration expectedRemainingTime(ExpectedRemainingTimeRef ref) { + +Duration expectedRemainingTime(Ref ref) { + final startTime = ref.watch(startTimeProvider); + final endTime = ref.watch(endTimeProvider); + final workQueueAsync = ref.watch(workQueueProvider); @@ -51544,15 +51549,15 @@ steps: patch: | --- b/generate_crossword/step_08/lib/providers.dart +++ a/generate_crossword/step_08/lib/providers.dart - @@ -65,6 +65,7 @@ class Size extends _$Size { + @@ -66,6 +66,7 @@ class Size extends _$Size { @riverpod - Stream workQueue(WorkQueueRef ref) async* { + Stream workQueue(Ref ref) async* { + final workers = ref.watch(workerCountProvider); final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); final emptyCrossword = - @@ -82,6 +83,7 @@ Stream workQueue(WorkQueueRef ref) async* { + @@ -83,6 +84,7 @@ Stream workQueue(Ref ref) async* { data: (wordList) => exploreCrosswordSolutions( crossword: emptyCrossword, wordList: wordList, @@ -51560,7 +51565,7 @@ steps: ), error: (error, stackTrace) async* { debugPrint('Error loading word list: $error'); - @@ -182,3 +184,33 @@ class DisplayInfo extends _$DisplayInfo { + @@ -183,3 +185,33 @@ class DisplayInfo extends _$DisplayInfo { loading: () => model.DisplayInfo.empty, ); } @@ -52201,7 +52206,7 @@ steps: import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; - @@ -15,6 +14,8 @@ import 'model.dart' as model; + @@ -16,6 +15,8 @@ import 'model.dart' as model; part 'providers.g.dart'; @@ -52209,16 +52214,16 @@ steps: + /// A provider for the wordlist to use when generating the crossword. @riverpod - Future> wordList(WordListRef ref) async { - @@ -65,7 +66,6 @@ class Size extends _$Size { + Future> wordList(Ref ref) async { + @@ -66,7 +67,6 @@ class Size extends _$Size { @riverpod - Stream workQueue(WorkQueueRef ref) async* { + Stream workQueue(Ref ref) async* { - final workers = ref.watch(workerCountProvider); final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); final emptyCrossword = - @@ -76,14 +76,11 @@ Stream workQueue(WorkQueueRef ref) async* { + @@ -77,14 +77,11 @@ Stream workQueue(Ref ref) async* { startLocation: model.Location.at(0, 0), ); @@ -52234,7 +52239,7 @@ steps: ), error: (error, stackTrace) async* { debugPrint('Error loading word list: $error'); - @@ -93,124 +90,78 @@ Stream workQueue(WorkQueueRef ref) async* { + @@ -94,124 +91,78 @@ Stream workQueue(Ref ref) async* { yield emptyWorkQueue; }, ); @@ -52276,7 +52281,7 @@ steps: -const _estimatedTotalCoverage = 0.54; - @riverpod - -Duration expectedRemainingTime(ExpectedRemainingTimeRef ref) { + -Duration expectedRemainingTime(Ref ref) { - final startTime = ref.watch(startTimeProvider); - final endTime = ref.watch(endTimeProvider); - final workQueueAsync = ref.watch(workQueueProvider); diff --git a/generate_crossword/step_02/analysis_options.yaml b/generate_crossword/step_02/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_02/analysis_options.yaml +++ b/generate_crossword/step_02/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_02/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_02/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_02/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_02/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_02/android/settings.gradle b/generate_crossword/step_02/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_02/android/settings.gradle +++ b/generate_crossword/step_02/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_02/pubspec.yaml b/generate_crossword/step_02/pubspec.yaml index 362aed624c..975431b666 100644 --- a/generate_crossword/step_02/pubspec.yaml +++ b/generate_crossword/step_02/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_03/analysis_options.yaml b/generate_crossword/step_03/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_03/analysis_options.yaml +++ b/generate_crossword/step_03/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_03/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_03/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_03/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_03/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_03/android/settings.gradle b/generate_crossword/step_03/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_03/android/settings.gradle +++ b/generate_crossword/step_03/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_03/lib/providers.dart b/generate_crossword/step_03/lib/providers.dart index d8a2d33bfa..f03b3cb367 100644 --- a/generate_crossword/step_03/lib/providers.dart +++ b/generate_crossword/step_03/lib/providers.dart @@ -6,13 +6,14 @@ import 'dart:convert'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will diff --git a/generate_crossword/step_03/lib/providers.g.dart b/generate_crossword/step_03/lib/providers.g.dart index 5a5438ab87..7040d6cd40 100644 --- a/generate_crossword/step_03/lib/providers.g.dart +++ b/generate_crossword/step_03/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,6 +21,8 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_03/pubspec.yaml b/generate_crossword/step_03/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_03/pubspec.yaml +++ b/generate_crossword/step_03/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_04/analysis_options.yaml b/generate_crossword/step_04/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_04/analysis_options.yaml +++ b/generate_crossword/step_04/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_04/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_04/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_04/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_04/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_04/android/settings.gradle b/generate_crossword/step_04/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_04/android/settings.gradle +++ b/generate_crossword/step_04/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_04/lib/providers.dart b/generate_crossword/step_04/lib/providers.dart index 8fcf35523f..7b7a0d1f89 100644 --- a/generate_crossword/step_04/lib/providers.dart +++ b/generate_crossword/step_04/lib/providers.dart @@ -8,6 +8,7 @@ import 'dart:math'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'model.dart' as model; @@ -17,7 +18,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -66,7 +67,7 @@ class Size extends _$Size { final _random = Random(); @riverpod -Stream crossword(CrosswordRef ref) async* { +Stream crossword(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); diff --git a/generate_crossword/step_04/lib/providers.g.dart b/generate_crossword/step_04/lib/providers.g.dart index 3b54bc03ea..feb1e90c3f 100644 --- a/generate_crossword/step_04/lib/providers.g.dart +++ b/generate_crossword/step_04/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$crosswordHash() => r'127a20f1ca78107d959f3926335dc049b1c9c9e1'; +String _$crosswordHash() => r'5de9f05091b3f0dad7c14a322ba090df2e63fae0'; /// See also [crossword]. @ProviderFor(crossword) @@ -35,6 +37,8 @@ final crosswordProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef CrosswordRef = AutoDisposeStreamProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -53,4 +57,4 @@ final sizeProvider = NotifierProvider.internal( typedef _$Size = Notifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_04/pubspec.yaml b/generate_crossword/step_04/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_04/pubspec.yaml +++ b/generate_crossword/step_04/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_05_a/analysis_options.yaml b/generate_crossword/step_05_a/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_05_a/analysis_options.yaml +++ b/generate_crossword/step_05_a/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_05_a/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_05_a/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_05_a/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_05_a/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_05_a/android/settings.gradle b/generate_crossword/step_05_a/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_05_a/android/settings.gradle +++ b/generate_crossword/step_05_a/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_05_a/lib/providers.dart b/generate_crossword/step_05_a/lib/providers.dart index deae5dfcce..02b84e6ae9 100644 --- a/generate_crossword/step_05_a/lib/providers.dart +++ b/generate_crossword/step_05_a/lib/providers.dart @@ -8,6 +8,7 @@ import 'dart:math'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'model.dart' as model; @@ -17,7 +18,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -66,7 +67,7 @@ class Size extends _$Size { final _random = Random(); @riverpod -Stream crossword(CrosswordRef ref) async* { +Stream crossword(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); diff --git a/generate_crossword/step_05_a/lib/providers.g.dart b/generate_crossword/step_05_a/lib/providers.g.dart index c661dcf40e..4e5e5c0043 100644 --- a/generate_crossword/step_05_a/lib/providers.g.dart +++ b/generate_crossword/step_05_a/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$crosswordHash() => r'88347f829031e496221c562ab2483a560585dd52'; +String _$crosswordHash() => r'1cb202ed90e863d0c3eefeea25e9dc54e2302aa7'; /// See also [crossword]. @ProviderFor(crossword) @@ -35,6 +37,8 @@ final crosswordProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef CrosswordRef = AutoDisposeStreamProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -53,4 +57,4 @@ final sizeProvider = NotifierProvider.internal( typedef _$Size = Notifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_05_a/pubspec.yaml b/generate_crossword/step_05_a/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_05_a/pubspec.yaml +++ b/generate_crossword/step_05_a/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_05_b/analysis_options.yaml b/generate_crossword/step_05_b/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_05_b/analysis_options.yaml +++ b/generate_crossword/step_05_b/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_05_b/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_05_b/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_05_b/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_05_b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_05_b/android/settings.gradle b/generate_crossword/step_05_b/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_05_b/android/settings.gradle +++ b/generate_crossword/step_05_b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_05_b/lib/providers.dart b/generate_crossword/step_05_b/lib/providers.dart index 5def0c9f84..b6191b4bb3 100644 --- a/generate_crossword/step_05_b/lib/providers.dart +++ b/generate_crossword/step_05_b/lib/providers.dart @@ -8,6 +8,7 @@ import 'dart:math'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'model.dart' as model; @@ -17,7 +18,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -66,7 +67,7 @@ class Size extends _$Size { final _random = Random(); @riverpod -Stream crossword(CrosswordRef ref) async* { +Stream crossword(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); diff --git a/generate_crossword/step_05_b/lib/providers.g.dart b/generate_crossword/step_05_b/lib/providers.g.dart index f31ca51912..597e43a797 100644 --- a/generate_crossword/step_05_b/lib/providers.g.dart +++ b/generate_crossword/step_05_b/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$crosswordHash() => r'abe739a5ad52279f376ef7bda652c2998d01d0a7'; +String _$crosswordHash() => r'5c7616c3495856efddd341da61a240e4a2f15931'; /// See also [crossword]. @ProviderFor(crossword) @@ -35,6 +37,8 @@ final crosswordProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef CrosswordRef = AutoDisposeStreamProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -53,4 +57,4 @@ final sizeProvider = NotifierProvider.internal( typedef _$Size = Notifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_05_b/pubspec.yaml b/generate_crossword/step_05_b/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_05_b/pubspec.yaml +++ b/generate_crossword/step_05_b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_05_c/analysis_options.yaml b/generate_crossword/step_05_c/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_05_c/analysis_options.yaml +++ b/generate_crossword/step_05_c/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_05_c/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_05_c/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_05_c/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_05_c/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_05_c/android/settings.gradle b/generate_crossword/step_05_c/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_05_c/android/settings.gradle +++ b/generate_crossword/step_05_c/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_05_c/lib/providers.dart b/generate_crossword/step_05_c/lib/providers.dart index 79b538ed9a..102f7a18ca 100644 --- a/generate_crossword/step_05_c/lib/providers.dart +++ b/generate_crossword/step_05_c/lib/providers.dart @@ -7,6 +7,7 @@ import 'dart:convert'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'isolates.dart'; @@ -16,7 +17,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -63,7 +64,7 @@ class Size extends _$Size { } @riverpod -Stream crossword(CrosswordRef ref) async* { +Stream crossword(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); diff --git a/generate_crossword/step_05_c/lib/providers.g.dart b/generate_crossword/step_05_c/lib/providers.g.dart index 0d311132da..4c96f91407 100644 --- a/generate_crossword/step_05_c/lib/providers.g.dart +++ b/generate_crossword/step_05_c/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$crosswordHash() => r'a92b6ea7ef4d28374bfaf52e4d8bbcf6e3013d7c'; +String _$crosswordHash() => r'8e2df416519f01ee1d6c1b64659f687d37cc07f2'; /// See also [crossword]. @ProviderFor(crossword) @@ -35,6 +37,8 @@ final crosswordProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef CrosswordRef = AutoDisposeStreamProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -53,4 +57,4 @@ final sizeProvider = NotifierProvider.internal( typedef _$Size = Notifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_05_c/pubspec.yaml b/generate_crossword/step_05_c/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_05_c/pubspec.yaml +++ b/generate_crossword/step_05_c/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_06/analysis_options.yaml b/generate_crossword/step_06/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_06/analysis_options.yaml +++ b/generate_crossword/step_06/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_06/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_06/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_06/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_06/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_06/android/settings.gradle b/generate_crossword/step_06/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_06/android/settings.gradle +++ b/generate_crossword/step_06/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_06/lib/providers.dart b/generate_crossword/step_06/lib/providers.dart index 79b538ed9a..102f7a18ca 100644 --- a/generate_crossword/step_06/lib/providers.dart +++ b/generate_crossword/step_06/lib/providers.dart @@ -7,6 +7,7 @@ import 'dart:convert'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'isolates.dart'; @@ -16,7 +17,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -63,7 +64,7 @@ class Size extends _$Size { } @riverpod -Stream crossword(CrosswordRef ref) async* { +Stream crossword(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); diff --git a/generate_crossword/step_06/lib/providers.g.dart b/generate_crossword/step_06/lib/providers.g.dart index 0d311132da..4c96f91407 100644 --- a/generate_crossword/step_06/lib/providers.g.dart +++ b/generate_crossword/step_06/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$crosswordHash() => r'a92b6ea7ef4d28374bfaf52e4d8bbcf6e3013d7c'; +String _$crosswordHash() => r'8e2df416519f01ee1d6c1b64659f687d37cc07f2'; /// See also [crossword]. @ProviderFor(crossword) @@ -35,6 +37,8 @@ final crosswordProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef CrosswordRef = AutoDisposeStreamProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -53,4 +57,4 @@ final sizeProvider = NotifierProvider.internal( typedef _$Size = Notifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_06/pubspec.yaml b/generate_crossword/step_06/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_06/pubspec.yaml +++ b/generate_crossword/step_06/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_07/analysis_options.yaml b/generate_crossword/step_07/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_07/analysis_options.yaml +++ b/generate_crossword/step_07/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_07/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_07/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_07/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_07/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_07/android/settings.gradle b/generate_crossword/step_07/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_07/android/settings.gradle +++ b/generate_crossword/step_07/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_07/lib/providers.dart b/generate_crossword/step_07/lib/providers.dart index 4d506972ab..683c943f0d 100644 --- a/generate_crossword/step_07/lib/providers.dart +++ b/generate_crossword/step_07/lib/providers.dart @@ -8,6 +8,7 @@ import 'dart:math'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'isolates.dart'; @@ -17,7 +18,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -64,7 +65,7 @@ class Size extends _$Size { } @riverpod -Stream workQueue(WorkQueueRef ref) async* { +Stream workQueue(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); final emptyCrossword = @@ -129,7 +130,7 @@ class EndTime extends _$EndTime { const _estimatedTotalCoverage = 0.54; @riverpod -Duration expectedRemainingTime(ExpectedRemainingTimeRef ref) { +Duration expectedRemainingTime(Ref ref) { final startTime = ref.watch(startTimeProvider); final endTime = ref.watch(endTimeProvider); final workQueueAsync = ref.watch(workQueueProvider); diff --git a/generate_crossword/step_07/lib/providers.g.dart b/generate_crossword/step_07/lib/providers.g.dart index cf0e191f2f..6363546d41 100644 --- a/generate_crossword/step_07/lib/providers.g.dart +++ b/generate_crossword/step_07/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$workQueueHash() => r'1c88fa732ab4e147378cf16e7eba561fb66254b6'; +String _$workQueueHash() => r'3e484a5afe91003b1523ffb42caa6b24967376a6'; /// See also [workQueue]. @ProviderFor(workQueue) @@ -35,9 +37,11 @@ final workQueueProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WorkQueueRef = AutoDisposeStreamProviderRef; String _$expectedRemainingTimeHash() => - r'1d054d63860240169de82ae4cdca3fc408d1d6f9'; + r'45f19e0d3e281c34cb54ed7f67cc783ec5073889'; /// See also [expectedRemainingTime]. @ProviderFor(expectedRemainingTime) @@ -51,6 +55,8 @@ final expectedRemainingTimeProvider = AutoDisposeProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef ExpectedRemainingTimeRef = AutoDisposeProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -132,4 +138,4 @@ final displayInfoProvider = typedef _$DisplayInfo = AutoDisposeNotifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_07/pubspec.yaml b/generate_crossword/step_07/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_07/pubspec.yaml +++ b/generate_crossword/step_07/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_08/analysis_options.yaml b/generate_crossword/step_08/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_08/analysis_options.yaml +++ b/generate_crossword/step_08/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_08/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_08/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_08/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_08/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_08/android/settings.gradle b/generate_crossword/step_08/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_08/android/settings.gradle +++ b/generate_crossword/step_08/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_08/lib/providers.dart b/generate_crossword/step_08/lib/providers.dart index ce1e9a061f..658211c69d 100644 --- a/generate_crossword/step_08/lib/providers.dart +++ b/generate_crossword/step_08/lib/providers.dart @@ -8,6 +8,7 @@ import 'dart:math'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'isolates.dart'; @@ -17,7 +18,7 @@ part 'providers.g.dart'; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -64,7 +65,7 @@ class Size extends _$Size { } @riverpod -Stream workQueue(WorkQueueRef ref) async* { +Stream workQueue(Ref ref) async* { final workers = ref.watch(workerCountProvider); final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); @@ -131,7 +132,7 @@ class EndTime extends _$EndTime { const _estimatedTotalCoverage = 0.54; @riverpod -Duration expectedRemainingTime(ExpectedRemainingTimeRef ref) { +Duration expectedRemainingTime(Ref ref) { final startTime = ref.watch(startTimeProvider); final endTime = ref.watch(endTimeProvider); final workQueueAsync = ref.watch(workQueueProvider); diff --git a/generate_crossword/step_08/lib/providers.g.dart b/generate_crossword/step_08/lib/providers.g.dart index 811f1de26e..c5660762c1 100644 --- a/generate_crossword/step_08/lib/providers.g.dart +++ b/generate_crossword/step_08/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$workQueueHash() => r'5267451dbdc9b229975d927509d5d14b8f3bcafa'; +String _$workQueueHash() => r'dca73cc7fb2cef3f5dcfdcc3a0926167e88c1083'; /// See also [workQueue]. @ProviderFor(workQueue) @@ -35,9 +37,11 @@ final workQueueProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WorkQueueRef = AutoDisposeStreamProviderRef; String _$expectedRemainingTimeHash() => - r'1d054d63860240169de82ae4cdca3fc408d1d6f9'; + r'45f19e0d3e281c34cb54ed7f67cc783ec5073889'; /// See also [expectedRemainingTime]. @ProviderFor(expectedRemainingTime) @@ -51,6 +55,8 @@ final expectedRemainingTimeProvider = AutoDisposeProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef ExpectedRemainingTimeRef = AutoDisposeProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -149,4 +155,4 @@ final workerCountProvider = typedef _$WorkerCount = Notifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_08/pubspec.yaml b/generate_crossword/step_08/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_08/pubspec.yaml +++ b/generate_crossword/step_08/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/generate_crossword/step_09/analysis_options.yaml b/generate_crossword/step_09/analysis_options.yaml index eb8d6bf302..d23a67e106 100644 --- a/generate_crossword/step_09/analysis_options.yaml +++ b/generate_crossword/step_09/analysis_options.yaml @@ -3,6 +3,8 @@ include: ../../analysis_options.yaml analyzer: language: strict-inference: false + exclude: + - lib/*.g.dart linter: rules: diff --git a/generate_crossword/step_09/android/gradle/wrapper/gradle-wrapper.properties b/generate_crossword/step_09/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..7bb2df6ba6 100644 --- a/generate_crossword/step_09/android/gradle/wrapper/gradle-wrapper.properties +++ b/generate_crossword/step_09/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/generate_crossword/step_09/android/settings.gradle b/generate_crossword/step_09/android/settings.gradle index 536165d35a..b9e43bd376 100644 --- a/generate_crossword/step_09/android/settings.gradle +++ b/generate_crossword/step_09/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/generate_crossword/step_09/lib/providers.dart b/generate_crossword/step_09/lib/providers.dart index e43e76d0b1..62e75c6222 100644 --- a/generate_crossword/step_09/lib/providers.dart +++ b/generate_crossword/step_09/lib/providers.dart @@ -7,6 +7,7 @@ import 'dart:convert'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'isolates.dart'; @@ -18,7 +19,7 @@ const backgroundWorkerCount = 4; /// A provider for the wordlist to use when generating the crossword. @riverpod -Future> wordList(WordListRef ref) async { +Future> wordList(Ref ref) async { // This codebase requires that all words consist of lowercase characters // in the range 'a'-'z'. Words containing uppercase letters will be // lowercased, and words containing runes outside this range will @@ -65,7 +66,7 @@ class Size extends _$Size { } @riverpod -Stream workQueue(WorkQueueRef ref) async* { +Stream workQueue(Ref ref) async* { final size = ref.watch(sizeProvider); final wordListAsync = ref.watch(wordListProvider); final emptyCrossword = diff --git a/generate_crossword/step_09/lib/providers.g.dart b/generate_crossword/step_09/lib/providers.g.dart index 19c3b8d554..18b1cd60e7 100644 --- a/generate_crossword/step_09/lib/providers.g.dart +++ b/generate_crossword/step_09/lib/providers.g.dart @@ -6,7 +6,7 @@ part of 'providers.dart'; // RiverpodGenerator // ************************************************************************** -String _$wordListHash() => r'8e3e9cd4555ba4baa045ccddd8dd45a25cfb6653'; +String _$wordListHash() => r'07003444d7241448561b638500001e31610b4717'; /// A provider for the wordlist to use when generating the crossword. /// @@ -21,8 +21,10 @@ final wordListProvider = AutoDisposeFutureProvider>.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WordListRef = AutoDisposeFutureProviderRef>; -String _$workQueueHash() => r'f7af7a45cf9151794c25ebfc87233f6275898214'; +String _$workQueueHash() => r'297192935b85a20243519048088822c6ff30dbac'; /// See also [workQueue]. @ProviderFor(workQueue) @@ -35,6 +37,8 @@ final workQueueProvider = AutoDisposeStreamProvider.internal( allTransitiveDependencies: null, ); +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element typedef WorkQueueRef = AutoDisposeStreamProviderRef; String _$sizeHash() => r'e551985965bf4119e8d90c0e8aa4f4d68a555b73'; @@ -68,4 +72,4 @@ final puzzleProvider = typedef _$Puzzle = AutoDisposeNotifier; // ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/generate_crossword/step_09/pubspec.yaml b/generate_crossword/step_09/pubspec.yaml index cc70f5ddf0..6a9c886e2c 100644 --- a/generate_crossword/step_09/pubspec.yaml +++ b/generate_crossword/step_09/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.5.1 + sdk: ^3.5.3 dependencies: flutter: @@ -12,21 +12,21 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 characters: ^1.3.0 - flutter_riverpod: ^2.5.1 + flutter_riverpod: ^2.6.1 intl: ^0.19.0 - riverpod: ^2.5.1 - riverpod_annotation: ^2.3.5 - two_dimensional_scrollables: ^0.3.1 + riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 + two_dimensional_scrollables: ^0.3.3 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - build_runner: ^2.4.12 + build_runner: ^2.4.13 built_value_generator: ^8.9.2 - custom_lint: ^0.6.5 - riverpod_generator: ^2.4.3 - riverpod_lint: ^2.3.13 + custom_lint: ^0.6.8 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true