From 4cac0e66617343cb5137abe76eae0ac8ae6447f8 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Wed, 8 Sep 2021 17:35:05 -0700 Subject: [PATCH] Lands beta branch into master for 2.5 (#895) --- .../books/flutter_module_books/pubspec.lock | 73 ++----------------- .../books/flutter_module_books/pubspec.yaml | 5 +- .../test/widget_test.dart | 21 +++++- .../IosBooks.xcodeproj/project.pbxproj | 18 ----- add_to_app/books/ios_books/Podfile.lock | 2 +- .../fullscreen/ios_fullscreen/Podfile.lock | 2 +- .../project.pbxproj | 18 ----- .../multiple_flutters_ios/Podfile.lock | 4 +- .../multiple_flutters_module/pubspec.lock | 8 +- .../plugin/ios_using_plugin/Podfile.lock | 2 +- .../flutter_module/pubspec.lock | 14 ++-- animations/lib/src/misc/carousel.dart | 2 +- .../lib/src/misc/repeating_animation.dart | 2 +- animations/pubspec.lock | 8 +- .../lib/src/widgets/photo_details.dart | 4 +- .../desktop_photo_search/pubspec.lock | 10 +-- .../test/widget_test.dart | 4 +- .../federated_plugin/example/pubspec.lock | 8 +- .../federated_plugin/pubspec.lock | 8 +- experimental/linting_tool/pubspec.lock | 10 +-- .../web_dashboard/lib/src/auth/firebase.dart | 2 +- .../web_dashboard/lib/src/pages/entries.dart | 2 +- .../lib/src/widgets/category_chart.dart | 3 +- .../lib/src/widgets/edit_entry.dart | 2 +- experimental/web_dashboard/pubspec.lock | 22 +++--- experimental/web_dashboard/pubspec.yaml | 6 +- experimental/web_dashboard/tool/grind.dart | 2 +- flutter_maps_firestore/ios/.gitignore | 1 + flutter_maps_firestore/pubspec.lock | 8 +- infinite_list/pubspec.lock | 8 +- ios_app_clip/ios/.gitignore | 1 + ios_app_clip/pubspec.lock | 8 +- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- isolate_example/lib/performance_page.dart | 2 +- isolate_example/pubspec.lock | 8 +- jsonexample/pubspec.lock | 10 +-- null_safety/null_safe_app/pubspec.lock | 8 +- null_safety/null_unsafe_app/pubspec.lock | 8 +- place_tracker/ios/.gitignore | 1 + place_tracker/pubspec.lock | 8 +- platform_channels/pubspec.lock | 8 +- platform_design/pubspec.lock | 8 +- platform_view_swift/pubspec.lock | 8 +- provider_counter/pubspec.lock | 8 +- provider_shopper/pubspec.lock | 8 +- testing_app/pubspec.lock | 29 +++++--- tool/flutter_ci_script_beta.sh | 20 ++--- tool/flutter_ci_script_dev.sh | 20 ++--- veggieseasons/ios/.gitignore | 1 + .../ios/Flutter/AppFrameworkInfo.plist | 2 +- veggieseasons/ios/Podfile.lock | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 6 +- veggieseasons/lib/data/preferences.dart | 2 +- veggieseasons/pubspec.lock | 8 +- 54 files changed, 188 insertions(+), 277 deletions(-) diff --git a/add_to_app/books/flutter_module_books/pubspec.lock b/add_to_app/books/flutter_module_books/pubspec.lock index d93a1489f..5a1e1eed3 100644 --- a/add_to_app/books/flutter_module_books/pubspec.lock +++ b/add_to_app/books/flutter_module_books/pubspec.lock @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -36,27 +36,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0" - build: - dependency: transitive - description: - name: build - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - built_collection: - dependency: transitive - description: - name: built_collection - url: "https://pub.dartlang.org" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - url: "https://pub.dartlang.org" - source: hosted - version: "8.1.2" characters: dependency: transitive description: @@ -85,13 +64,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" - code_builder: - dependency: transitive - description: - name: code_builder - url: "https://pub.dartlang.org" - source: hosted - version: "4.1.0" collection: dependency: transitive description: @@ -113,13 +85,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" - dart_style: - dependency: transitive - description: - name: dart_style - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" fake_async: dependency: transitive description: @@ -134,13 +99,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.1.2" - fixnum: - dependency: transitive - description: - name: fixnum - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" flutter: dependency: "direct main" description: flutter @@ -152,7 +110,7 @@ packages: name: flutter_lints url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" flutter_test: dependency: "direct dev" description: flutter @@ -172,20 +130,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.10" meta: dependency: transitive description: @@ -193,13 +144,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.7.0" - mockito: - dependency: "direct dev" - description: - name: mockito - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.15" package_config: dependency: transitive description: @@ -227,7 +171,7 @@ packages: name: pigeon url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" pub_semver: dependency: transitive description: @@ -240,13 +184,6 @@ packages: description: flutter source: sdk version: "0.0.99" - source_gen: - dependency: transitive - description: - name: source_gen - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" source_span: dependency: transitive description: @@ -288,7 +225,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/add_to_app/books/flutter_module_books/pubspec.yaml b/add_to_app/books/flutter_module_books/pubspec.yaml index 2c46a1063..48cd41dbb 100644 --- a/add_to_app/books/flutter_module_books/pubspec.yaml +++ b/add_to_app/books/flutter_module_books/pubspec.yaml @@ -13,11 +13,10 @@ dependencies: sdk: flutter dev_dependencies: - pigeon: ^1.0.0 - mockito: ^5.0.0 + pigeon: ^1.0.2 flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/add_to_app/books/flutter_module_books/test/widget_test.dart b/add_to_app/books/flutter_module_books/test/widget_test.dart index 259dcd209..6ff5eb5a5 100644 --- a/add_to_app/books/flutter_module_books/test/widget_test.dart +++ b/add_to_app/books/flutter_module_books/test/widget_test.dart @@ -6,7 +6,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_module_books/api.dart'; import 'package:flutter_module_books/main.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:mockito/mockito.dart'; void main() { testWidgets('Pressing clear calls the cancel API', (tester) async { @@ -20,7 +19,7 @@ void main() { await tester.tap(find.byIcon(Icons.clear)); - verify(mockHostApi.cancel()); + expect(mockHostApi.cancelCalls, 1); }); testWidgets('Pressing done calls the finish editing API', (tester) async { @@ -34,8 +33,22 @@ void main() { await tester.tap(find.byIcon(Icons.check)); - verify(mockHostApi.finishEditingBook(any)); + expect(mockHostApi.booksFinished.length, 1); }); } -class MockHostBookApi extends Mock implements HostBookApi {} +// A super-simple mock for testing that calls are made to the API. +class MockHostBookApi implements HostBookApi { + int cancelCalls = 0; + final booksFinished = []; + + @override + Future cancel() async { + cancelCalls++; + } + + @override + Future finishEditingBook(Book arg) async { + booksFinished.add(arg); + } +} diff --git a/add_to_app/books/ios_books/IosBooks.xcodeproj/project.pbxproj b/add_to_app/books/ios_books/IosBooks.xcodeproj/project.pbxproj index 837e5c138..dbf0b074d 100644 --- a/add_to_app/books/ios_books/IosBooks.xcodeproj/project.pbxproj +++ b/add_to_app/books/ios_books/IosBooks.xcodeproj/project.pbxproj @@ -109,7 +109,6 @@ buildConfigurationList = 0DDE4C4B25E0390700389930 /* Build configuration list for PBXNativeTarget "IosBooks" */; buildPhases = ( 10D6942EFE7900338BEA50F9 /* [CP] Check Pods Manifest.lock */, - 676852EE9ED16CAB1E3D2710 /* [CP] Prepare Artifacts */, 887B098B8DCF409FE0F1E164 /* [CP-User] Run Flutter Build flutter_module_books Script */, 0DDE4C3325E0390700389930 /* Sources */, 0DDE4C3425E0390700389930 /* Frameworks */, @@ -194,23 +193,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 676852EE9ED16CAB1E3D2710 /* [CP] Prepare Artifacts */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-IosBooks/Pods-IosBooks-artifacts-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Prepare Artifacts"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-IosBooks/Pods-IosBooks-artifacts-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-IosBooks/Pods-IosBooks-artifacts.sh\"\n"; - showEnvVarsInLog = 0; - }; 887B098B8DCF409FE0F1E164 /* [CP-User] Run Flutter Build flutter_module_books Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/add_to_app/books/ios_books/Podfile.lock b/add_to_app/books/ios_books/Podfile.lock index c6f3f21f0..48bd43a59 100644 --- a/add_to_app/books/ios_books/Podfile.lock +++ b/add_to_app/books/ios_books/Podfile.lock @@ -25,4 +25,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 96e3c2df11e96c20ece1d4185fde634ec6324fcc -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.1 diff --git a/add_to_app/fullscreen/ios_fullscreen/Podfile.lock b/add_to_app/fullscreen/ios_fullscreen/Podfile.lock index 053545660..fb1989a65 100644 --- a/add_to_app/fullscreen/ios_fullscreen/Podfile.lock +++ b/add_to_app/fullscreen/ios_fullscreen/Podfile.lock @@ -25,4 +25,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f9809794b37c933b7cb40791d64724dc2376c54 -COCOAPODS: 1.10.0 +COCOAPODS: 1.10.1 diff --git a/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos.xcodeproj/project.pbxproj b/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos.xcodeproj/project.pbxproj index ac1f8084c..0aacd928d 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos.xcodeproj/project.pbxproj +++ b/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos.xcodeproj/project.pbxproj @@ -108,7 +108,6 @@ buildConfigurationList = 0D61B1F225BB8A2400A1A590 /* Build configuration list for PBXNativeTarget "MultipleFluttersIos" */; buildPhases = ( 3BC074A3AF94322EF6E73F8B /* [CP] Check Pods Manifest.lock */, - C63B2D75D5C822F12D344293 /* [CP] Prepare Artifacts */, 9A714FC9CCEF3D4EFCAF0E2F /* [CP-User] Run Flutter Build multiple_flutters_module Script */, 0D61B1DA25BB8A2300A1A590 /* Sources */, 0D61B1DB25BB8A2300A1A590 /* Frameworks */, @@ -202,23 +201,6 @@ shellPath = /bin/sh; shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../multiple_flutters_module/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build"; }; - C63B2D75D5C822F12D344293 /* [CP] Prepare Artifacts */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MultipleFluttersIos/Pods-MultipleFluttersIos-artifacts-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Prepare Artifacts"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MultipleFluttersIos/Pods-MultipleFluttersIos-artifacts-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MultipleFluttersIos/Pods-MultipleFluttersIos-artifacts.sh\"\n"; - showEnvVarsInLog = 0; - }; D93C82A75960A3ABB9D69453 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile.lock b/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile.lock index 3d5dc5886..7c3398022 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile.lock +++ b/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile.lock @@ -19,10 +19,10 @@ EXTERNAL SOURCES: :path: "../multiple_flutters_module/.ios/Flutter" SPEC CHECKSUMS: - Flutter: ac41d61a47ae5bf8195a5598d2d63754888ec0d5 + Flutter: bdfa2e8fe0e2880a2c6a58a0b1a8675c262a07af FlutterPluginRegistrant: 2afd5ea46d3a949472c9b7da6462d8fbf7d8b16e multiple_flutters_module: fdf461a0e4225614d475110d85db6fd6de5aeff1 PODFILE CHECKSUM: d7f39981f450db398859f05de2475ec53909a487 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.1 diff --git a/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock b/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock index 29526b6b5..e40ac24f6 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock +++ b/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/add_to_app/plugin/ios_using_plugin/Podfile.lock b/add_to_app/plugin/ios_using_plugin/Podfile.lock index 66eeafd9d..577366349 100644 --- a/add_to_app/plugin/ios_using_plugin/Podfile.lock +++ b/add_to_app/plugin/ios_using_plugin/Podfile.lock @@ -39,4 +39,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 357b6c94e1edb8289fba0dbdd79daa105ab9d88c -COCOAPODS: 1.10.0 +COCOAPODS: 1.10.1 diff --git a/add_to_app/prebuilt_module/flutter_module/pubspec.lock b/add_to_app/prebuilt_module/flutter_module/pubspec.lock index 2337efd9f..c25fd31a7 100644 --- a/add_to_app/prebuilt_module/flutter_module/pubspec.lock +++ b/add_to_app/prebuilt_module/flutter_module/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" flutter: dependency: "direct main" description: flutter @@ -125,7 +125,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -153,7 +153,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "4.2.3" provider: dependency: "direct main" description: @@ -214,7 +214,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: @@ -235,7 +235,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "6.2.0" + version: "7.1.1" webdriver: dependency: transitive description: diff --git a/animations/lib/src/misc/carousel.dart b/animations/lib/src/misc/carousel.dart index d894bce35..a6d8cb23f 100644 --- a/animations/lib/src/misc/carousel.dart +++ b/animations/lib/src/misc/carousel.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; class CarouselDemo extends StatelessWidget { diff --git a/animations/lib/src/misc/repeating_animation.dart b/animations/lib/src/misc/repeating_animation.dart index a98bfe479..3c083b1c6 100644 --- a/animations/lib/src/misc/repeating_animation.dart +++ b/animations/lib/src/misc/repeating_animation.dart @@ -15,7 +15,7 @@ class RepeatingAnimationDemo extends StatefulWidget { class RepeatingAnimationDemoState extends State with SingleTickerProviderStateMixin { late final AnimationController _controller; - late final Animation _borderRadius; + late final Animation _borderRadius; @override void initState() { diff --git a/animations/pubspec.lock b/animations/pubspec.lock index 29526b6b5..e40ac24f6 100644 --- a/animations/pubspec.lock +++ b/animations/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/experimental/desktop_photo_search/lib/src/widgets/photo_details.dart b/experimental/desktop_photo_search/lib/src/widgets/photo_details.dart index 027e9944d..7c20ceb64 100644 --- a/experimental/desktop_photo_search/lib/src/widgets/photo_details.dart +++ b/experimental/desktop_photo_search/lib/src/widgets/photo_details.dart @@ -27,8 +27,7 @@ class PhotoDetails extends StatefulWidget { _PhotoDetailsState createState() => _PhotoDetailsState(); } -class _PhotoDetailsState extends State - with TickerProviderStateMixin { +class _PhotoDetailsState extends State { Widget _buildPhotoAttribution(BuildContext context) { return Row( children: [ @@ -69,7 +68,6 @@ class _PhotoDetailsState extends State borderRadius: BorderRadius.circular(4), ), child: AnimatedSize( - vsync: this, duration: const Duration(milliseconds: 750), child: Padding( padding: const EdgeInsets.fromLTRB(16, 16, 16, 40), diff --git a/experimental/desktop_photo_search/pubspec.lock b/experimental/desktop_photo_search/pubspec.lock index f9cdde5fc..7146155d4 100644 --- a/experimental/desktop_photo_search/pubspec.lock +++ b/experimental/desktop_photo_search/pubspec.lock @@ -14,7 +14,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "1.7.2" ansicolor: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -119,7 +119,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -395,7 +395,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -554,7 +554,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: diff --git a/experimental/desktop_photo_search/test/widget_test.dart b/experimental/desktop_photo_search/test/widget_test.dart index f95ca49af..b549af430 100644 --- a/experimental/desktop_photo_search/test/widget_test.dart +++ b/experimental/desktop_photo_search/test/widget_test.dart @@ -4,11 +4,11 @@ import 'dart:typed_data'; -import 'package:desktop_photo_search/src/unsplash/photo.dart'; -import 'package:flutter/material.dart'; import 'package:desktop_photo_search/src/model/photo_search_model.dart'; +import 'package:desktop_photo_search/src/unsplash/photo.dart'; import 'package:desktop_photo_search/src/unsplash/search_photos_response.dart'; import 'package:desktop_photo_search/src/unsplash/unsplash.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/experimental/federated_plugin/federated_plugin/example/pubspec.lock b/experimental/federated_plugin/federated_plugin/example/pubspec.lock index 5aa8443dd..a3635be83 100644 --- a/experimental/federated_plugin/federated_plugin/example/pubspec.lock +++ b/experimental/federated_plugin/federated_plugin/example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -202,7 +202,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/experimental/federated_plugin/federated_plugin/pubspec.lock b/experimental/federated_plugin/federated_plugin/pubspec.lock index 8bec5973b..95f9963c0 100644 --- a/experimental/federated_plugin/federated_plugin/pubspec.lock +++ b/experimental/federated_plugin/federated_plugin/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -127,7 +127,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -188,7 +188,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/experimental/linting_tool/pubspec.lock b/experimental/linting_tool/pubspec.lock index 40ebe368e..4d555be43 100644 --- a/experimental/linting_tool/pubspec.lock +++ b/experimental/linting_tool/pubspec.lock @@ -21,7 +21,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "1.7.2" args: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -112,7 +112,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -435,7 +435,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -643,7 +643,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: diff --git a/experimental/web_dashboard/lib/src/auth/firebase.dart b/experimental/web_dashboard/lib/src/auth/firebase.dart index 3ac5b802c..d2c602fcf 100644 --- a/experimental/web_dashboard/lib/src/auth/firebase.dart +++ b/experimental/web_dashboard/lib/src/auth/firebase.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:firebase_auth/firebase_auth.dart' hide FirebaseUser; import 'package:flutter/services.dart'; import 'package:google_sign_in/google_sign_in.dart'; -import 'package:firebase_auth/firebase_auth.dart' hide FirebaseUser; import 'auth.dart'; diff --git a/experimental/web_dashboard/lib/src/pages/entries.dart b/experimental/web_dashboard/lib/src/pages/entries.dart index dc1a70a37..f3e4b55c8 100644 --- a/experimental/web_dashboard/lib/src/pages/entries.dart +++ b/experimental/web_dashboard/lib/src/pages/entries.dart @@ -3,8 +3,8 @@ // BSD-style license that can be found in the LICENSE file. import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; import 'package:intl/intl.dart' as intl; +import 'package:provider/provider.dart'; import '../api/api.dart'; import '../app.dart'; diff --git a/experimental/web_dashboard/lib/src/widgets/category_chart.dart b/experimental/web_dashboard/lib/src/widgets/category_chart.dart index 1940e073e..ec83ad9a5 100644 --- a/experimental/web_dashboard/lib/src/widgets/category_chart.dart +++ b/experimental/web_dashboard/lib/src/widgets/category_chart.dart @@ -2,9 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:flutter/material.dart'; - import 'package:charts_flutter/flutter.dart' as charts; +import 'package:flutter/material.dart'; import 'package:intl/intl.dart' as intl; import '../api/api.dart'; diff --git a/experimental/web_dashboard/lib/src/widgets/edit_entry.dart b/experimental/web_dashboard/lib/src/widgets/edit_entry.dart index 409236d3a..c81500667 100644 --- a/experimental/web_dashboard/lib/src/widgets/edit_entry.dart +++ b/experimental/web_dashboard/lib/src/widgets/edit_entry.dart @@ -3,9 +3,9 @@ // BSD-style license that can be found in the LICENSE file. import 'package:flutter/material.dart'; +import 'package:intl/intl.dart' as intl; import 'package:provider/provider.dart'; import 'package:web_dashboard/src/api/api.dart'; -import 'package:intl/intl.dart' as intl; import '../app.dart'; import 'categories_dropdown.dart'; diff --git a/experimental/web_dashboard/pubspec.lock b/experimental/web_dashboard/pubspec.lock index 2bdfe3206..105202473 100644 --- a/experimental/web_dashboard/pubspec.lock +++ b/experimental/web_dashboard/pubspec.lock @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -105,21 +105,23 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" charts_common: dependency: transitive description: name: charts_common url: "https://pub.dartlang.org" source: hosted - version: "0.9.0" + version: "0.11.0" charts_flutter: dependency: "direct main" description: - name: charts_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.0" + path: charts_flutter + ref: HEAD + resolved-ref: "30477090290b348ed3101bc13017aae465f59017" + url: "git://github.com/google/charts.git" + source: git + version: "0.11.0" checked_yaml: dependency: transitive description: @@ -365,7 +367,7 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.1" + version: "0.17.0" io: dependency: transitive description: @@ -421,7 +423,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -594,7 +596,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: diff --git a/experimental/web_dashboard/pubspec.yaml b/experimental/web_dashboard/pubspec.yaml index 7ad09b2b8..02874b235 100644 --- a/experimental/web_dashboard/pubspec.yaml +++ b/experimental/web_dashboard/pubspec.yaml @@ -1,6 +1,7 @@ name: web_dashboard description: A dashboard app sample version: 1.0.0+1 +publish_to: none environment: sdk: ">=2.6.0 <3.0.0" dependencies: @@ -14,7 +15,10 @@ dependencies: json_annotation: ^3.0.0 provider: ^4.0.0 uuid: ^2.0.0 - charts_flutter: ^0.9.0 + charts_flutter: + git: + url: git://github.com/google/charts.git + path: charts_flutter dev_dependencies: flutter_test: sdk: flutter diff --git a/experimental/web_dashboard/tool/grind.dart b/experimental/web_dashboard/tool/grind.dart index 46adf7a12..302439ef8 100644 --- a/experimental/web_dashboard/tool/grind.dart +++ b/experimental/web_dashboard/tool/grind.dart @@ -3,9 +3,9 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:convert'; import 'dart:io'; -import 'package:path/path.dart' as path; import 'package:grinder/grinder.dart'; +import 'package:path/path.dart' as path; void main(List args) => grind(args); diff --git a/flutter_maps_firestore/ios/.gitignore b/flutter_maps_firestore/ios/.gitignore index fe4a4744b..e172b50e0 100644 --- a/flutter_maps_firestore/ios/.gitignore +++ b/flutter_maps_firestore/ios/.gitignore @@ -25,6 +25,7 @@ Flutter/flutter_assets/ Flutter/flutter_export_environment.sh ServiceDefinitions.json Runner/GeneratedPluginRegistrant.* +/build/ # Exceptions to above rules. !default.mode1v3 diff --git a/flutter_maps_firestore/pubspec.lock b/flutter_maps_firestore/pubspec.lock index 080f32154..b2e59b1c4 100644 --- a/flutter_maps_firestore/pubspec.lock +++ b/flutter_maps_firestore/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -211,7 +211,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -286,7 +286,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/infinite_list/pubspec.lock b/infinite_list/pubspec.lock index 322dc1313..d1f45106d 100644 --- a/infinite_list/pubspec.lock +++ b/infinite_list/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -162,7 +162,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/ios_app_clip/ios/.gitignore b/ios_app_clip/ios/.gitignore index e96ef602b..48744a871 100644 --- a/ios_app_clip/ios/.gitignore +++ b/ios_app_clip/ios/.gitignore @@ -24,6 +24,7 @@ Flutter/flutter_assets/ Flutter/flutter_export_environment.sh ServiceDefinitions.json Runner/GeneratedPluginRegistrant.* +/build/ # Exceptions to above rules. !default.mode1v3 diff --git a/ios_app_clip/pubspec.lock b/ios_app_clip/pubspec.lock index 5fbe06923..d6edb6dc9 100644 --- a/ios_app_clip/pubspec.lock +++ b/ios_app_clip/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -108,7 +108,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -169,7 +169,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/isolate_example/ios/Flutter/AppFrameworkInfo.plist b/isolate_example/ios/Flutter/AppFrameworkInfo.plist index 9367d483e..8d4492f97 100644 --- a/isolate_example/ios/Flutter/AppFrameworkInfo.plist +++ b/isolate_example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/isolate_example/lib/performance_page.dart b/isolate_example/lib/performance_page.dart index 2e3f8f748..014e4337b 100644 --- a/isolate_example/lib/performance_page.dart +++ b/isolate_example/lib/performance_page.dart @@ -136,7 +136,7 @@ class SmoothAnimationWidget extends StatefulWidget { class SmoothAnimationWidgetState extends State with TickerProviderStateMixin { late final AnimationController _animationController; - late final Animation _borderAnimation; + late final Animation _borderAnimation; @override void initState() { diff --git a/isolate_example/pubspec.lock b/isolate_example/pubspec.lock index 421c3deee..c56fc2bfd 100644 --- a/isolate_example/pubspec.lock +++ b/isolate_example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -87,7 +87,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -155,7 +155,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/jsonexample/pubspec.lock b/jsonexample/pubspec.lock index 05c5943ee..134119ba5 100644 --- a/jsonexample/pubspec.lock +++ b/jsonexample/pubspec.lock @@ -14,7 +14,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "1.7.2" args: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -112,7 +112,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -297,7 +297,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -428,7 +428,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: diff --git a/null_safety/null_safe_app/pubspec.lock b/null_safety/null_safe_app/pubspec.lock index f689077bf..2bf2875b6 100644 --- a/null_safety/null_safe_app/pubspec.lock +++ b/null_safety/null_safe_app/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/null_safety/null_unsafe_app/pubspec.lock b/null_safety/null_unsafe_app/pubspec.lock index 29526b6b5..e40ac24f6 100644 --- a/null_safety/null_unsafe_app/pubspec.lock +++ b/null_safety/null_unsafe_app/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/place_tracker/ios/.gitignore b/place_tracker/ios/.gitignore index 151026b91..f35bfe00b 100644 --- a/place_tracker/ios/.gitignore +++ b/place_tracker/ios/.gitignore @@ -25,6 +25,7 @@ Flutter/flutter_assets/ Flutter/flutter_export_environment.sh ServiceDefinitions.json Runner/GeneratedPluginRegistrant.* +/build/ # Exceptions to above rules. !default.mode1v3 diff --git a/place_tracker/pubspec.lock b/place_tracker/pubspec.lock index 99b09747a..40ae42078 100644 --- a/place_tracker/pubspec.lock +++ b/place_tracker/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -169,7 +169,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -258,7 +258,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/platform_channels/pubspec.lock b/platform_channels/pubspec.lock index 29526b6b5..e40ac24f6 100644 --- a/platform_channels/pubspec.lock +++ b/platform_channels/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/platform_design/pubspec.lock b/platform_design/pubspec.lock index 07280dda1..7dca2fc69 100644 --- a/platform_design/pubspec.lock +++ b/platform_design/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -108,7 +108,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -162,7 +162,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/platform_view_swift/pubspec.lock b/platform_view_swift/pubspec.lock index aab87e4d8..b56b055ca 100644 --- a/platform_view_swift/pubspec.lock +++ b/platform_view_swift/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/provider_counter/pubspec.lock b/provider_counter/pubspec.lock index 5aec9ed9b..d29600e2a 100644 --- a/provider_counter/pubspec.lock +++ b/provider_counter/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -162,7 +162,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/provider_shopper/pubspec.lock b/provider_shopper/pubspec.lock index 421c3deee..c56fc2bfd 100644 --- a/provider_shopper/pubspec.lock +++ b/provider_shopper/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -87,7 +87,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -155,7 +155,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/testing_app/pubspec.lock b/testing_app/pubspec.lock index a04a511c4..e1bf8f71a 100644 --- a/testing_app/pubspec.lock +++ b/testing_app/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "22.0.0" + version: "23.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "2.0.0" archive: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" cli_util: dependency: transitive description: @@ -119,7 +119,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" flutter: dependency: "direct main" description: flutter @@ -142,6 +142,13 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -214,7 +221,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -277,7 +284,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "4.2.3" provider: dependency: "direct main" description: @@ -387,21 +394,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.16.8" + version: "1.17.10" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.19" + version: "0.4.0" typed_data: dependency: transitive description: @@ -422,7 +429,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "6.2.0" + version: "7.1.1" watcher: dependency: transitive description: diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index 3160b6e2d..c54c267fc 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -8,27 +8,20 @@ source "$DIR/flutter_ci_script_shared.sh" flutter doctor -v declare -ar PROJECT_NAMES=( - # TODO(redbrogdon) Replace use of mockito - # "add_to_app/books/flutter_module_books" + "add_to_app/books/flutter_module_books" "add_to_app/fullscreen/flutter_module" "add_to_app/multiple_flutters/multiple_flutters_module" "add_to_app/plugin/flutter_module_using_plugin" "add_to_app/prebuilt_module/flutter_module" - # TODO(redbrogdon): Update once this PR makes it to release: - # https://github.com/flutter/flutter/pull/79860 - # "animations" - # TODO(redbrogdon): Restore during next beta branch merge. - # "experimental/desktop_photo_search" + "animations" + "experimental/desktop_photo_search" "experimental/federated_plugin/federated_plugin" - # TODO(redbrogdon): Restore during next beta branch merge. - # "experimental/web_dashboard" + "experimental/web_dashboard" "experimental/linting_tool" "flutter_maps_firestore" "infinite_list" "ios_app_clip" - # TODO(redbrogdon): Update once this PR makes it to release: - # https://github.com/flutter/flutter/pull/79860 - # "isolate_example" + "isolate_example" "jsonexample" "null_safety/null_safe_app" "null_safety/null_unsafe_app" @@ -39,8 +32,7 @@ declare -ar PROJECT_NAMES=( "provider_counter" "provider_shopper" "testing_app" - # TODO(redbrogdon): Restore during next beta branch merge. - # "veggieseasons" + "veggieseasons" ) ci_projects "beta" "${PROJECT_NAMES[@]}" diff --git a/tool/flutter_ci_script_dev.sh b/tool/flutter_ci_script_dev.sh index 0546ec22a..daa192a83 100755 --- a/tool/flutter_ci_script_dev.sh +++ b/tool/flutter_ci_script_dev.sh @@ -8,27 +8,20 @@ source "$DIR/flutter_ci_script_shared.sh" flutter doctor -v declare -ar PROJECT_NAMES=( - # TODO(redbrogdon) Replace use of mockito - # "add_to_app/books/flutter_module_books" + "add_to_app/books/flutter_module_books" "add_to_app/fullscreen/flutter_module" "add_to_app/multiple_flutters/multiple_flutters_module" "add_to_app/plugin/flutter_module_using_plugin" "add_to_app/prebuilt_module/flutter_module" - # TODO(redbrogdon): Update once this PR makes it to release: - # https://github.com/flutter/flutter/pull/79860 - # "animations" - # TODO(redbrogdon): Restore during next beta branch merge. - # "experimental/desktop_photo_search" + "animations" + "experimental/desktop_photo_search" "experimental/federated_plugin/federated_plugin" - # TODO(redbrogdon): Restore during next beta branch merge. - # "experimental/web_dashboard" + "experimental/web_dashboard" "experimental/linting_tool" "flutter_maps_firestore" "infinite_list" "ios_app_clip" - # TODO(redbrogdon): Update once this PR makes it to release: - # https://github.com/flutter/flutter/pull/79860 - # "isolate_example" + "isolate_example" "jsonexample" "null_safety/null_safe_app" "null_safety/null_unsafe_app" @@ -39,8 +32,7 @@ declare -ar PROJECT_NAMES=( "provider_counter" "provider_shopper" "testing_app" - # TODO(redbrogdon): Restore during next beta branch merge. - # "veggieseasons" + "veggieseasons" ) ci_projects "dev" "${PROJECT_NAMES[@]}" diff --git a/veggieseasons/ios/.gitignore b/veggieseasons/ios/.gitignore index e96ef602b..48744a871 100644 --- a/veggieseasons/ios/.gitignore +++ b/veggieseasons/ios/.gitignore @@ -24,6 +24,7 @@ Flutter/flutter_assets/ Flutter/flutter_export_environment.sh ServiceDefinitions.json Runner/GeneratedPluginRegistrant.* +/build/ # Exceptions to above rules. !default.mode1v3 diff --git a/veggieseasons/ios/Flutter/AppFrameworkInfo.plist b/veggieseasons/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f78a..f2872cf47 100644 --- a/veggieseasons/ios/Flutter/AppFrameworkInfo.plist +++ b/veggieseasons/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/veggieseasons/ios/Podfile.lock b/veggieseasons/ios/Podfile.lock index 8332245d0..9d8f8aac2 100644 --- a/veggieseasons/ios/Podfile.lock +++ b/veggieseasons/ios/Podfile.lock @@ -14,7 +14,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/shared_preferences/ios" SPEC CHECKSUMS: - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 522b4fe16..0784afe9f 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -348,7 +348,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -431,7 +431,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -480,7 +480,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/veggieseasons/lib/data/preferences.dart b/veggieseasons/lib/data/preferences.dart index 71baf6933..f413a2293 100644 --- a/veggieseasons/lib/data/preferences.dart +++ b/veggieseasons/lib/data/preferences.dart @@ -5,8 +5,8 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; -import 'package:veggieseasons/data/veggie.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:veggieseasons/data/veggie.dart'; /// A model class that mirrors the options in [SettingsScreen] and stores data /// in shared preferences. diff --git a/veggieseasons/pubspec.lock b/veggieseasons/pubspec.lock index 5b37d4a2b..e1e712169 100644 --- a/veggieseasons/pubspec.lock +++ b/veggieseasons/pubspec.lock @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -169,7 +169,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -328,7 +328,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: