diff --git a/analysis_options.yaml b/analysis_options.yaml deleted file mode 100644 index 0747f317f..000000000 --- a/analysis_options.yaml +++ /dev/null @@ -1,24 +0,0 @@ -include: package:lint/analysis_options.yaml - -analyzer: - exclude: - - "**/*.g.dart" - -# All lints: https://dart-lang.github.io/linter/lints/ -linter: - rules: - # STYLE - # cascade_invocations: true # May has issues: https://github.com/dart-lang/linter/issues/1589 - # prefer_foreach: true - # prefer_int_literals: true - # prefer_single_quotes: true - # use_raw_strings: true - - # DISABLE - # We have prints for better debugging. Maybe not the best option. - avoid_print: false - # Highlights localization imports and others which are annoying to fix - # depend_on_referenced_packages: false - # I prefer the distinction between local source files and imported packages. - # Apparently package imports are preferred because they allow for easy find and replace - # always_use_package_imports: false diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 4f5ea7cb6..6731f0218 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -1,24 +1,19 @@ name: studyu_app +version: 2.0.0-dev.7 description: An app to facilitate N-of-1 trials +publish_to: none homepage: https://hpi.de/lippert/projects/studyu.html repository: https://github.com/hpi-studyu/studyu -publish_to: 'none' - -version: '2.0.0-dev.7' - -environment: - # todo upgrade to null safety - sdk: ">=2.7.0 <3.0.0" - -dependencies: +environment: + sdk: '>=2.7.0 <3.0.0' +dependencies: charts_common: ^0.12.0 charts_flutter: ^0.12.0 chewie: ^1.4.0 cupertino_icons: ^1.0.5 extended_math: - git: - url: https://github.com/nstrelow/extended_math.git + git: https://github.com/nstrelow/extended_math.git fhir: ^0.4.7 flutter: sdk: flutter @@ -26,13 +21,12 @@ dependencies: flutter_local_notifications: ^13.0.0 flutter_localizations: sdk: flutter - grizzly_distuv: ^1.0.0 - timezone: ^0.9.1 flutter_timezone: ^1.0.4 flutter_web_plugins: sdk: flutter + grizzly_distuv: ^1.0.0 intersperse: ^2.0.0 - intl: ^0.17.0 # flutter_localizations sdk + intl: ^0.17.0 material_design_icons_flutter: ^6.0.7096 package_info_plus: ^3.0.3 pdf: ^3.9.0 @@ -47,19 +41,20 @@ dependencies: supabase: ^1.6.0 supabase_flutter: ^1.5.0 timeline_tile: ^2.0.0 + timezone: ^0.9.1 + universal_html: ^2.0.9 url_launcher: ^6.1.10 uuid: ^3.0.7 video_player: ^2.6.0 - universal_html: ^2.0.9 -dev_dependencies: +dev_dependencies: flutter_launcher_icons: ^0.12.0 - flutter_test: - sdk: flutter flutter_lints: ^2.0.1 + flutter_test: + sdk: flutter flutter_icons: - image_path: 'assets/images/icon.png' + image_path: assets/images/icon.png android: true ios: true @@ -67,6 +62,6 @@ flutter: generate: true uses-material-design: true assets: - - assets/ - - assets/images/ - - assets/fonts/ + - assets/ + - assets/images/ + - assets/fonts/ diff --git a/core/pubspec.yaml b/core/pubspec.yaml index b126c6de1..e709fbe57 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -1,6 +1,6 @@ name: studyu_core -description: StudyU models and common functions for app and designer version: 4.0.0-dev.5 +description: StudyU models and common functions for app and designer homepage: https://hpi.de/lippert/projects/studyu.html repository: https://github.com/hpi-studyu/studyu diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock index 224139794..42904bead 100644 --- a/designer_v2/pubspec.lock +++ b/designer_v2/pubspec.lock @@ -233,10 +233,10 @@ packages: dependency: transitive description: name: gotrue - sha256: b266845913346d6c1bd3424f3c3913ab18a03d17ffb01dfa84c5547caa15ccf2 + sha256: fb4e0095c623aadec304af39a929aabb4f47729ae7f9286f38e90df2e521104b url: "https://pub.dev" source: hosted - version: "1.5.1" + version: "1.5.2" hive: dependency: transitive description: @@ -377,26 +377,26 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e" + sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7" url: "https://pub.dev" source: hosted - version: "2.0.23" + version: "2.0.24" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972 + sha256: "026b97a6c29da75181a37aae2eba9227f5fe13cb2838c6b975ce209328b8ab4e" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a" + sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" url: "https://pub.dev" source: hosted - version: "2.1.9" + version: "2.1.10" path_provider_platform_interface: dependency: transitive description: @@ -409,10 +409,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d" + sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" platform: dependency: transitive description: @@ -489,10 +489,10 @@ packages: dependency: transitive description: name: realtime_client - sha256: f50f3dce6ac48de7a6d29f6b9b0b8864c1ecdebf322a1724b0aa70e95babd109 + sha256: "467ef702a35858004a1b9c475dc0ebc0b858ade758e99295beda7f101d523198" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.3" retry: dependency: transitive description: @@ -529,26 +529,26 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4 + sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521 url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.17" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259" + sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa + sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" shared_preferences_platform_interface: dependency: transitive description: @@ -561,18 +561,18 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7" + sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.6" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d + sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" sky_engine: dependency: transitive description: flutter @@ -700,34 +700,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732" + sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1" url: "https://pub.dev" source: hosted - version: "6.0.24" + version: "6.0.25" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5 + sha256: "7ab1e5b646623d6a2537aa59d5d039f90eebef75a7c25e105f6f75de1f7750c3" url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682 + sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06" + sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" url_launcher_platform_interface: dependency: transitive description: @@ -740,18 +740,18 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b" + sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.16" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b" + sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.5" uuid: dependency: "direct main" description: diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml index 967bf7592..5ce328e46 100644 --- a/designer_v2/pubspec.yaml +++ b/designer_v2/pubspec.yaml @@ -1,44 +1,44 @@ name: studyu_designer_v2 -description: Create digital N-of-1 studies with StudyU -publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.1.0-dev.7 +publish_to: none +description: Create digital N-of-1 studies with StudyU -environment: - sdk: ">=2.17.0 <3.0.0" +environment: + sdk: '>=2.17.0 <3.0.0' dependencies: + archive: ^3.3.6 + async: ^2.10.0 # flutter_test sdk + csv: ^5.0.1 + cupertino_icons: ^1.0.5 + dynamic_color: ^1.6.2 + equatable: ^2.0.5 flutter: sdk: flutter + flutter_colorpicker: ^1.0.3 + flutter_riverpod: ^2.3.1 flutter_web_plugins: sdk: flutter - flutter_riverpod: ^2.3.1 - cupertino_icons: ^1.0.5 - dynamic_color: ^1.6.2 - studyu_core: ^4.0.0-dev.5 - studyu_flutter_common: ^1.4.0-dev.7 + form_builder_validators: ^8.5.0 go_router: ^6.2.0 - shared_preferences: ^2.0.18 - equatable: ^2.0.5 + material_color_utilities: ^0.2.0 + material_design_icons_flutter: ^6.0.7096 + pointer_interceptor: ^0.9.3+4 + reactive_color_picker: ^0.4.0 # reactive_color_picker <=>0.5.0 + reactive_forms: ^14.1.0 # form_builder_validators <=8.5.0 rxdart: ^0.27.7 + shared_preferences: ^2.0.18 + studyu_core: ^4.0.0-dev.5 + studyu_flutter_common: ^1.4.0-dev.7 supabase: ^1.6.0 supabase_flutter: ^1.5.0 url_launcher: ^6.1.10 - reactive_forms: ^14.1.0 # form_builder_validators <=8.5.0 - reactive_color_picker: ^0.4.0 # reactive_color_picker <=>0.5.0. - form_builder_validators: ^8.5.0 uuid: ^3.0.7 - csv: ^5.0.1 - archive: ^3.3.6 - async: ^2.10.0 # flutter_test sdk - pointer_interceptor: ^0.9.3+4 - material_color_utilities: ^0.2.0 - flutter_colorpicker: ^1.0.3 - material_design_icons_flutter: ^6.0.7096 -dev_dependencies: - flutter_test: - sdk: flutter +dev_dependencies: flutter_lints: ^2.0.1 + flutter_test: + sdk: flutter flutter: uses-material-design: true @@ -46,3 +46,4 @@ flutter: assets: - assets/ - assets/images/ + diff --git a/flutter_analysis_options.yaml b/flutter_analysis_options.yaml index f2c8de68e..b31f92662 100644 --- a/flutter_analysis_options.yaml +++ b/flutter_analysis_options.yaml @@ -42,5 +42,7 @@ linter: # Apparently package imports are preferred because they allow for easy find and replace # always_use_package_imports: false + sort_pub_dependencies: true + # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options \ No newline at end of file diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml index b27e568e8..60ff9e2ff 100644 --- a/flutter_common/pubspec.yaml +++ b/flutter_common/pubspec.yaml @@ -1,6 +1,6 @@ name: studyu_flutter_common -description: StudyU common flutter components and functions for app and designer version: 1.4.0-dev.7 +description: StudyU common flutter components and functions for app and designer homepage: https://hpi.de/lippert/projects/studyu.html repository: https://github.com/hpi-studyu/studyu