Skip to content

Commit

Permalink
Updating the main branch to the latest develop code (#2521)
Browse files Browse the repository at this point in the history
* Deleted all files in the main branch in anticipation of merging develop into main cleanly

* Merge develop into main

---------

Co-authored-by: Peter Harrison <[email protected]>
  • Loading branch information
palisadoes and palisadian authored Jun 2, 2024
1 parent eb2dc73 commit 3c618a3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
32 changes: 16 additions & 16 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -434,10 +434,10 @@ packages:
dependency: "direct main"
description:
name: flutter_local_notifications
sha256: "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4"
sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
url: "https://pub.dev"
source: hosted
version: "17.1.0"
version: "17.1.2"
flutter_local_notifications_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -529,10 +529,10 @@ packages:
dependency: "direct main"
description:
name: get_it
sha256: ae30b28cc73053f79fd46b15f430db16cae22a0554e6cd25333c840b310b0270
sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1
url: "https://pub.dev"
source: hosted
version: "7.6.9"
version: "7.7.0"
glob:
dependency: transitive
description:
Expand Down Expand Up @@ -705,10 +705,10 @@ packages:
dependency: "direct main"
description:
name: image_picker
sha256: "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd"
sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720"
url: "https://pub.dev"
source: hosted
version: "1.0.7"
version: "1.1.1"
image_picker_android:
dependency: transitive
description:
Expand Down Expand Up @@ -753,10 +753,10 @@ packages:
dependency: transitive
description:
name: image_picker_platform_interface
sha256: fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b
sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80"
url: "https://pub.dev"
source: hosted
version: "2.9.3"
version: "2.10.0"
image_picker_windows:
dependency: transitive
description:
Expand Down Expand Up @@ -1089,10 +1089,10 @@ packages:
dependency: "direct main"
description:
name: pointycastle
sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
url: "https://pub.dev"
source: hosted
version: "3.9.0"
version: "3.9.1"
pool:
dependency: transitive
description:
Expand Down Expand Up @@ -1366,26 +1366,26 @@ packages:
dependency: "direct main"
description:
name: syncfusion_flutter_calendar
sha256: e06aff78dd2040a3239d59b8543020afd4bfcfde5d66d028d6ac04a84ed0e4b0
sha256: "286ff7a451cebc8f21cc0fc7d0032040957851a2535616178bf54e8e488a833f"
url: "https://pub.dev"
source: hosted
version: "25.1.41"
version: "25.2.3"
syncfusion_flutter_core:
dependency: transitive
description:
name: syncfusion_flutter_core
sha256: "708425f534ef04253334763c8b75acc79eaec2d9b325bcd862575ea0a2207d87"
sha256: "6c534bb282e1429ac082354ace1b7c6d4496a258e62c948b7ca2b52acca8a514"
url: "https://pub.dev"
source: hosted
version: "25.1.41"
version: "25.2.3"
syncfusion_flutter_datepicker:
dependency: "direct main"
description:
name: syncfusion_flutter_datepicker
sha256: b6abaa80a6dff16552a5b7a7b3879094d285ae5a49a33466d4d1a62041e250dd
sha256: "50c8d4b5029313a1774f85a71a49319a840dc8fb12096ae041b20da4fbb9e58a"
url: "https://pub.dev"
source: hosted
version: "25.1.41"
version: "25.2.3"
synchronized:
dependency: transitive
description:
Expand Down
12 changes: 6 additions & 6 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,36 @@ dependencies:
sdk: flutter
flutter_braintree: ^4.0.0
flutter_cache_manager: ^3.3.2
flutter_local_notifications: ^17.1.0
flutter_local_notifications: ^17.1.2
flutter_localizations:
sdk: flutter
flutter_reaction_button: ^3.0.0+3
flutter_speed_dial: ^7.0.0
flutter_svg: ^2.0.10+1
font_awesome_flutter: ^10.7.0
get_it: ^7.6.9
get_it: ^7.7.0
graphql_flutter: ^5.1.2
hive: ^2.2.3
http: ^1.2.1
image_cropper: ^5.0.1
image_picker: ^1.1.0
image_picker: ^1.1.1
intl: ^0.18.1
json_annotation: ^4.7.0
mockito: ^5.4.4
network_image_mock: ^2.1.1
path_provider: ^2.1.3
permission_handler: 11.3.1
plugin_platform_interface: ^2.1.7
pointycastle: ^3.9.0
pointycastle: ^3.9.1
provider: ^6.1.2
qr_code_scanner: ^1.0.0
qr_flutter: 4.1.0
quick_actions: ^1.0.6
shared_preferences: ^2.2.3
shimmer: ^3.0.0
social_share: ^2.2.1
syncfusion_flutter_calendar: ^25.1.41
syncfusion_flutter_datepicker: ^25.1.39
syncfusion_flutter_calendar: ^25.2.3
syncfusion_flutter_datepicker: ^25.2.3
timelines: ^0.1.0
tutorial_coach_mark: ^1.2.11
uni_links: ^0.5.1
Expand Down

0 comments on commit 3c618a3

Please sign in to comment.