From 8dc91a224e79a34b69983413e0792fb1594aaa18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20M=C3=A4rz?= Date: Mon, 20 Dec 2021 16:37:29 +0100 Subject: [PATCH] feature/update flutter 2.8 --- example/pubspec.lock | 74 ++++++----- example/pubspec.yaml | 4 + lib/src/answer_format/answer_format.dart | 2 +- lib/src/navigator/rules/navigation_rule.dart | 3 +- lib/src/result/step/video_step_result.dart | 1 - lib/src/steps/step.dart | 4 +- lib/src/survey_kit.dart | 3 +- lib/src/task/task.dart | 3 +- lib/src/views/boolean_answer_view.dart | 1 - lib/src/views/date_answer_view.dart | 1 - lib/src/views/integer_answer_view.dart | 1 - .../views/multiple_choice_answer_view.dart | 1 - lib/src/views/scale_answer_view.dart | 1 - lib/src/views/single_choice_answer_view.dart | 1 - lib/src/views/text_answer_view.dart | 1 - lib/src/views/time_answer_view.dart | 1 - lib/src/views/video_step_view.dart | 1 - lib/src/views/widget/selection_list_tile.dart | 1 - lib/src/views/widget/step_view.dart | 3 +- lib/src/views/widget/survey_app_bar.dart | 2 - lib/src/views/widget/time_picker_widget.dart | 3 +- lib/src/widget/survey_progress.dart | 1 - pubspec.lock | 122 ++++++++++-------- pubspec.yaml | 6 +- .../predefined_steps/video_step_test.dart | 2 +- test/steps/step_test.dart | 2 +- test/views/date_answer_view_test.dart | 2 +- 27 files changed, 134 insertions(+), 113 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 58acc5be..2810abbc 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,21 +7,21 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.6" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.2" bloc: dependency: transitive description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.2.1" boolean_selector: dependency: transitive description: @@ -35,14 +35,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" chewie: dependency: transitive description: @@ -71,13 +71,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.1" cupertino_icons: dependency: transitive description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" fake_async: dependency: transitive description: @@ -103,14 +110,14 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.3.3" flutter_platform_widgets: dependency: transitive description: name: flutter_platform_widgets url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.12.0" flutter_test: dependency: "direct dev" description: flutter @@ -127,7 +134,14 @@ packages: name: go_router url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.5.5" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.0" intl: dependency: transitive description: @@ -148,35 +162,35 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.4.0" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" lottie: dependency: transitive description: name: lottie url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -199,12 +213,12 @@ packages: source: hosted version: "0.4.0" provider: - dependency: transitive + dependency: "direct overridden" description: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.1" sky_engine: dependency: transitive description: flutter @@ -258,7 +272,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.3" typed_data: dependency: transitive description: @@ -272,77 +286,77 @@ packages: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.0.5" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" video_player: dependency: transitive description: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.2.8" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.2.0" video_player_web: dependency: transitive description: name: video_player_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.4" wakelock: dependency: transitive description: name: wakelock url: "https://pub.dartlang.org" source: hosted - version: "0.5.2" + version: "0.5.6" wakelock_macos: dependency: transitive description: name: wakelock_macos url: "https://pub.dartlang.org" source: hosted - version: "0.1.0+1" + version: "0.4.0" wakelock_platform_interface: dependency: transitive description: name: wakelock_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "0.2.1+1" + version: "0.3.0" wakelock_web: dependency: transitive description: name: wakelock_web url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+1" + version: "0.4.0" wakelock_windows: dependency: transitive description: name: wakelock_windows url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.2.0" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.4" + version: "2.3.1" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=2.14.0 <3.0.0" + flutter: ">=2.5.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 8892a1e1..7124c22d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -8,6 +8,10 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: sdk: '>=2.12.0-0 <3.0.0' + +dependency_overrides: + provider: ^6.0.0 + dependencies: flutter: sdk: flutter diff --git a/lib/src/answer_format/answer_format.dart b/lib/src/answer_format/answer_format.dart index 44e9753e..9cc710bc 100644 --- a/lib/src/answer_format/answer_format.dart +++ b/lib/src/answer_format/answer_format.dart @@ -6,7 +6,7 @@ import 'package:survey_kit/src/answer_format/scale_answer_format.dart'; import 'package:survey_kit/src/answer_format/single_choice_answer_format.dart'; import 'package:survey_kit/src/answer_format/text_answer_format.dart'; import 'package:survey_kit/src/answer_format/time_answer_formart.dart'; -import 'package:survey_kit/survey_kit.dart'; +import 'package:survey_kit/src/steps/predefined_steps/answer_format_not_defined_exception.dart'; abstract class AnswerFormat { const AnswerFormat(); diff --git a/lib/src/navigator/rules/navigation_rule.dart b/lib/src/navigator/rules/navigation_rule.dart index ecfb9985..0d882099 100644 --- a/lib/src/navigator/rules/navigation_rule.dart +++ b/lib/src/navigator/rules/navigation_rule.dart @@ -1,5 +1,6 @@ +import 'package:survey_kit/src/navigator/rules/conditional_navigation_rule.dart'; +import 'package:survey_kit/src/navigator/rules/direct_navigation_rule.dart'; import 'package:survey_kit/src/navigator/rules/rule_not_defined_exception.dart'; -import 'package:survey_kit/survey_kit.dart'; abstract class NavigationRule { const NavigationRule(); diff --git a/lib/src/result/step/video_step_result.dart b/lib/src/result/step/video_step_result.dart index 10a7c17b..12a492de 100644 --- a/lib/src/result/step/video_step_result.dart +++ b/lib/src/result/step/video_step_result.dart @@ -1,6 +1,5 @@ import 'package:survey_kit/src/result/question_result.dart'; import 'package:survey_kit/src/steps/identifier/identifier.dart'; -import 'package:survey_kit/survey_kit.dart'; class VideoStepResult extends QuestionResult { VideoStepResult({ diff --git a/lib/src/steps/step.dart b/lib/src/steps/step.dart index d434e113..f9de1bbf 100644 --- a/lib/src/steps/step.dart +++ b/lib/src/steps/step.dart @@ -2,9 +2,11 @@ import 'package:flutter/widgets.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:survey_kit/src/result/question_result.dart'; import 'package:survey_kit/src/steps/identifier/step_identifier.dart'; +import 'package:survey_kit/src/steps/predefined_steps/completion_step.dart'; +import 'package:survey_kit/src/steps/predefined_steps/instruction_step.dart'; +import 'package:survey_kit/src/steps/predefined_steps/question_step.dart'; import 'package:survey_kit/src/steps/predefined_steps/video_step.dart'; import 'package:survey_kit/src/steps/step_not_defined_exception.dart'; -import 'package:survey_kit/survey_kit.dart'; abstract class Step { final StepIdentifier stepIdentifier; diff --git a/lib/src/survey_kit.dart b/lib/src/survey_kit.dart index a8b1b344..4850d04d 100644 --- a/lib/src/survey_kit.dart +++ b/lib/src/survey_kit.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; @@ -13,8 +12,8 @@ import 'package:survey_kit/src/result/survey/survey_result.dart'; import 'package:survey_kit/src/task/navigable_task.dart'; import 'package:survey_kit/src/task/ordered_task.dart'; import 'package:survey_kit/src/task/task.dart'; +import 'package:survey_kit/src/views/widget/survey_app_bar.dart'; import 'package:survey_kit/src/widget/survey_progress_configuration.dart'; -import 'package:survey_kit/survey_kit.dart'; import 'package:collection/collection.dart' show IterableExtension; class SurveyKit extends StatefulWidget { diff --git a/lib/src/task/task.dart b/lib/src/task/task.dart index 31691ecd..248e3b2e 100644 --- a/lib/src/task/task.dart +++ b/lib/src/task/task.dart @@ -1,8 +1,9 @@ import 'package:json_annotation/json_annotation.dart'; import 'package:survey_kit/src/steps/step.dart'; import 'package:survey_kit/src/task/identifier/task_identifier.dart'; +import 'package:survey_kit/src/task/navigable_task.dart'; +import 'package:survey_kit/src/task/ordered_task.dart'; import 'package:survey_kit/src/task/task_not_defined_exception.dart'; -import 'package:survey_kit/survey_kit.dart'; /// Abstract definition of survey task /// diff --git a/lib/src/views/boolean_answer_view.dart b/lib/src/views/boolean_answer_view.dart index 7337c033..ef9e1bfd 100644 --- a/lib/src/views/boolean_answer_view.dart +++ b/lib/src/views/boolean_answer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:survey_kit/src/answer_format/boolean_answer_format.dart'; import 'package:survey_kit/src/views/widget/selection_list_tile.dart'; import 'package:survey_kit/src/result/question/boolean_question_result.dart'; diff --git a/lib/src/views/date_answer_view.dart b/lib/src/views/date_answer_view.dart index 9f21262b..39a1604b 100644 --- a/lib/src/views/date_answer_view.dart +++ b/lib/src/views/date_answer_view.dart @@ -1,6 +1,5 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; import 'package:intl/intl.dart'; import 'package:survey_kit/src/answer_format/date_answer_format.dart'; diff --git a/lib/src/views/integer_answer_view.dart b/lib/src/views/integer_answer_view.dart index af1aa666..fa9afad3 100644 --- a/lib/src/views/integer_answer_view.dart +++ b/lib/src/views/integer_answer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; import 'package:survey_kit/src/answer_format/integer_answer_format.dart'; import 'package:survey_kit/src/views/decoration/input_decoration.dart'; diff --git a/lib/src/views/multiple_choice_answer_view.dart b/lib/src/views/multiple_choice_answer_view.dart index d0a4518b..660d1620 100644 --- a/lib/src/views/multiple_choice_answer_view.dart +++ b/lib/src/views/multiple_choice_answer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:survey_kit/src/answer_format/multiple_choice_answer_format.dart'; import 'package:survey_kit/src/answer_format/text_choice.dart'; import 'package:survey_kit/src/views/widget/selection_list_tile.dart'; diff --git a/lib/src/views/scale_answer_view.dart b/lib/src/views/scale_answer_view.dart index 3f0ef798..42837533 100644 --- a/lib/src/views/scale_answer_view.dart +++ b/lib/src/views/scale_answer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:survey_kit/src/answer_format/scale_answer_format.dart'; import 'package:survey_kit/src/result/question/scale_question_result.dart'; import 'package:survey_kit/src/steps/predefined_steps/question_step.dart'; diff --git a/lib/src/views/single_choice_answer_view.dart b/lib/src/views/single_choice_answer_view.dart index 029c8642..4695520e 100644 --- a/lib/src/views/single_choice_answer_view.dart +++ b/lib/src/views/single_choice_answer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:survey_kit/src/answer_format/single_choice_answer_format.dart'; import 'package:survey_kit/src/answer_format/text_choice.dart'; import 'package:survey_kit/src/views/widget/selection_list_tile.dart'; diff --git a/lib/src/views/text_answer_view.dart b/lib/src/views/text_answer_view.dart index f6ff8bb9..c4367ffd 100644 --- a/lib/src/views/text_answer_view.dart +++ b/lib/src/views/text_answer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; import 'package:survey_kit/src/answer_format/text_answer_format.dart'; import 'package:survey_kit/src/views/decoration/input_decoration.dart'; diff --git a/lib/src/views/time_answer_view.dart b/lib/src/views/time_answer_view.dart index 12f86537..c327d205 100644 --- a/lib/src/views/time_answer_view.dart +++ b/lib/src/views/time_answer_view.dart @@ -1,6 +1,5 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; import 'package:survey_kit/src/answer_format/time_answer_formart.dart'; import 'package:survey_kit/src/result/question/time_question_result.dart'; diff --git a/lib/src/views/video_step_view.dart b/lib/src/views/video_step_view.dart index 486d2c99..d86d6946 100644 --- a/lib/src/views/video_step_view.dart +++ b/lib/src/views/video_step_view.dart @@ -1,6 +1,5 @@ import 'package:chewie/chewie.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:survey_kit/src/controller/survey_controller.dart'; import 'package:survey_kit/src/result/question_result.dart'; import 'package:survey_kit/src/result/step/video_step_result.dart'; diff --git a/lib/src/views/widget/selection_list_tile.dart b/lib/src/views/widget/selection_list_tile.dart index 0abbfd0a..8461b9d4 100644 --- a/lib/src/views/widget/selection_list_tile.dart +++ b/lib/src/views/widget/selection_list_tile.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; class SelectionListTile extends StatelessWidget { final String text; diff --git a/lib/src/views/widget/step_view.dart b/lib/src/views/widget/step_view.dart index 0fd4f189..68ff7e20 100644 --- a/lib/src/views/widget/step_view.dart +++ b/lib/src/views/widget/step_view.dart @@ -1,8 +1,7 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:survey_kit/src/controller/survey_controller.dart'; +import 'package:survey_kit/src/result/question_result.dart'; import 'package:survey_kit/src/steps/step.dart' as surveystep; -import 'package:survey_kit/survey_kit.dart'; import 'package:provider/provider.dart'; class StepView extends StatelessWidget { diff --git a/lib/src/views/widget/survey_app_bar.dart b/lib/src/views/widget/survey_app_bar.dart index 1650da58..fd5d0c8a 100644 --- a/lib/src/views/widget/survey_app_bar.dart +++ b/lib/src/views/widget/survey_app_bar.dart @@ -1,6 +1,4 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; import 'package:survey_kit/src/configuration/app_bar_configuration.dart'; import 'package:survey_kit/src/controller/survey_controller.dart'; diff --git a/lib/src/views/widget/time_picker_widget.dart b/lib/src/views/widget/time_picker_widget.dart index 5a0c7bac..bac71e50 100644 --- a/lib/src/views/widget/time_picker_widget.dart +++ b/lib/src/views/widget/time_picker_widget.dart @@ -14,7 +14,6 @@ import 'dart:ui' as ui; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; -import 'package:flutter/widgets.dart'; // Examples can assume: // late BuildContext context; @@ -971,7 +970,7 @@ class _DialState extends State<_Dial> with SingleTickerProviderStateMixin { _theta = _thetaController .drive(CurveTween(curve: standardEasing)) .drive(_thetaTween) - ..addListener(() => setState(() {/* _theta.value has changed */})); + ..addListener(() => setState(() {/* _theta.value has changed */})); } late ThemeData themeData; diff --git a/lib/src/widget/survey_progress.dart b/lib/src/widget/survey_progress.dart index 1e1009a9..c3829cc9 100644 --- a/lib/src/widget/survey_progress.dart +++ b/lib/src/widget/survey_progress.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:survey_kit/src/presenter/survey_presenter.dart'; import 'package:survey_kit/src/presenter/survey_state.dart'; diff --git a/pubspec.lock b/pubspec.lock index 721a48f7..4fedad95 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,35 +14,35 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "1.7.2" archive: dependency: transitive description: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.6" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.3.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.2" bloc: dependency: "direct main" description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.2.1" boolean_selector: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.2.0" build_config: dependency: transitive description: @@ -70,56 +70,56 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.1.7" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.2.2" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.0" + version: "8.1.3" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -140,7 +140,7 @@ packages: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" + version: "0.3.5" clock: dependency: transitive description: @@ -154,7 +154,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.1.0" collection: dependency: "direct main" description: @@ -168,7 +168,7 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" crypto: dependency: transitive description: @@ -176,20 +176,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.1" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" dart_style: dependency: transitive description: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.1" fake_async: dependency: transitive description: @@ -229,14 +236,14 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "7.0.1" + version: "7.3.3" flutter_platform_widgets: dependency: "direct main" description: name: flutter_platform_widgets url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.12.0" flutter_test: dependency: "direct dev" description: flutter @@ -253,28 +260,35 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" go_router: dependency: "direct main" description: name: go_router url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.5.5" graphs: dependency: transitive description: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.0" http_multi_server: dependency: transitive description: @@ -302,7 +316,7 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.3" js: dependency: transitive description: @@ -316,49 +330,49 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.1.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "4.1.3" + version: "4.1.4" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" lottie: dependency: "direct main" description: name: lottie url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" nested: dependency: transitive description: @@ -372,7 +386,7 @@ packages: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -407,28 +421,28 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.1" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.1.4" + version: "1.2.0" shelf_web_socket: dependency: transitive description: @@ -447,7 +461,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" source_span: dependency: transitive description: @@ -496,7 +510,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.3" timing: dependency: transitive description: @@ -517,77 +531,77 @@ packages: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.0.5" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" video_player: dependency: "direct main" description: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.2.8" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.2.0" video_player_web: dependency: transitive description: name: video_player_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.4" wakelock: dependency: transitive description: name: wakelock url: "https://pub.dartlang.org" source: hosted - version: "0.5.2" + version: "0.5.6" wakelock_macos: dependency: transitive description: name: wakelock_macos url: "https://pub.dartlang.org" source: hosted - version: "0.1.0+1" + version: "0.4.0" wakelock_platform_interface: dependency: transitive description: name: wakelock_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "0.2.1+1" + version: "0.3.0" wakelock_web: dependency: transitive description: name: wakelock_web url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+1" + version: "0.4.0" wakelock_windows: dependency: transitive description: name: wakelock_windows url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.2.0" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" web_socket_channel: dependency: transitive description: @@ -601,7 +615,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.4" + version: "2.3.1" yaml: dependency: transitive description: @@ -610,5 +624,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=2.14.0 <3.0.0" + flutter: ">=2.5.0" diff --git a/pubspec.yaml b/pubspec.yaml index ae8c62e4..640e35b5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,6 +9,9 @@ environment: sdk: '>=2.12.0-0 <3.0.0' flutter: ">=1.20.0" +dependency_overrides: + provider: ^6.0.0 + dependencies: bloc: ^7.0.0 chewie: ^1.2.2 @@ -21,9 +24,8 @@ dependencies: go_router: ^2.1.0 intl: ^0.17.0 json_annotation: ^4.0.1 - lottie: ^1.0.1 - provider: ^5.0.0 + provider: ^6.0.0 uuid: ^3.0.4 video_player: ^2.1.6 diff --git a/test/steps/predefined_steps/video_step_test.dart b/test/steps/predefined_steps/video_step_test.dart index ed3348a8..4755f2df 100644 --- a/test/steps/predefined_steps/video_step_test.dart +++ b/test/steps/predefined_steps/video_step_test.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:flutter_test/flutter_test.dart'; +import 'package:survey_kit/src/steps/identifier/step_identifier.dart'; import 'package:survey_kit/src/steps/predefined_steps/video_step.dart'; -import 'package:survey_kit/survey_kit.dart'; void main() { test('serialization of video step', () { diff --git a/test/steps/step_test.dart b/test/steps/step_test.dart index adf19c7e..2cbc48ae 100644 --- a/test/steps/step_test.dart +++ b/test/steps/step_test.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter_test/flutter_test.dart'; +import 'package:survey_kit/src/steps/identifier/step_identifier.dart'; import 'package:survey_kit/src/steps/predefined_steps/instruction_step.dart'; import 'package:survey_kit/src/steps/step.dart'; -import 'package:survey_kit/survey_kit.dart'; void main() { test('instruction step is the same created by json and code', () { diff --git a/test/views/date_answer_view_test.dart b/test/views/date_answer_view_test.dart index 895c90fc..92b4206b 100644 --- a/test/views/date_answer_view_test.dart +++ b/test/views/date_answer_view_test.dart @@ -7,7 +7,7 @@ import 'package:survey_kit/src/answer_format/date_answer_format.dart'; import 'package:survey_kit/src/controller/survey_controller.dart'; import 'package:survey_kit/src/steps/predefined_steps/question_step.dart'; import 'package:survey_kit/src/views/date_answer_view.dart'; -import 'package:survey_kit/survey_kit.dart'; +import 'package:survey_kit/src/widget/survey_progress_configuration.dart'; void main() { DateAnswerView _validDateAnswerView() => DateAnswerView(