Skip to content

Commit 4485ef5

Browse files
committed
fix rebase
1 parent 302521d commit 4485ef5

1 file changed

Lines changed: 28 additions & 42 deletions

File tree

pubspec.lock

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,18 @@ packages:
3737
dependency: "direct main"
3838
description:
3939
name: archethic_dapp_framework_flutter
40-
<<<<<<< HEAD
41-
sha256: "2eae3c029bb7cb2916122142804c72dc6f30e91849fef70f9c0b4402458e4eec"
42-
url: "https://pub.dev"
43-
source: hosted
44-
version: "1.1.24"
45-
=======
4640
sha256: bba3f504d6488895cdfd1c132d9e95d4f6df828a6d64c390da6f575803d510b9
4741
url: "https://pub.dev"
4842
source: hosted
4943
version: "1.2.6"
50-
>>>>>>> f92e81b (feat: :sparkles: Replace local history with on chain history)
5144
archethic_lib_dart:
5245
dependency: transitive
5346
description:
5447
name: archethic_lib_dart
55-
<<<<<<< HEAD
56-
sha256: "34654e90c7cfdc326f8bdeea396c18eb34dba9109838ac15d2de5f58184c38c6"
57-
url: "https://pub.dev"
58-
source: hosted
59-
version: "3.3.18"
60-
=======
61-
sha256: ecdf2e5619725f4f5ca4f2ce6a35b3ac99fa8ca46ec2bac4b2ed6990b350cbfe
48+
sha256: "421f3ffe4b2f3816424fbb81ef572344a46a67590e4a237cc6251f8101582335"
6249
url: "https://pub.dev"
6350
source: hosted
64-
version: "3.4.0"
65-
>>>>>>> f92e81b (feat: :sparkles: Replace local history with on chain history)
51+
version: "3.4.1"
6652
archethic_wallet_client:
6753
dependency: "direct main"
6854
description:
@@ -131,10 +117,10 @@ packages:
131117
dependency: transitive
132118
description:
133119
name: build_daemon
134-
sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
120+
sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
135121
url: "https://pub.dev"
136122
source: hosted
137-
version: "4.0.1"
123+
version: "4.0.2"
138124
build_resolvers:
139125
dependency: transitive
140126
description:
@@ -147,18 +133,18 @@ packages:
147133
dependency: "direct dev"
148134
description:
149135
name: build_runner
150-
sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
136+
sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
151137
url: "https://pub.dev"
152138
source: hosted
153-
version: "2.4.9"
139+
version: "2.4.11"
154140
build_runner_core:
155141
dependency: transitive
156142
description:
157143
name: build_runner_core
158-
sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
144+
sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
159145
url: "https://pub.dev"
160146
source: hosted
161-
version: "7.3.0"
147+
version: "7.3.1"
162148
built_collection:
163149
dependency: transitive
164150
description:
@@ -394,10 +380,10 @@ packages:
394380
dependency: "direct main"
395381
description:
396382
name: freezed_annotation
397-
sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
383+
sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
398384
url: "https://pub.dev"
399385
source: hosted
400-
version: "2.4.1"
386+
version: "2.4.4"
401387
frontend_server_client:
402388
dependency: transitive
403389
description:
@@ -738,10 +724,10 @@ packages:
738724
dependency: transitive
739725
description:
740726
name: path_provider_android
741-
sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
727+
sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
742728
url: "https://pub.dev"
743729
source: hosted
744-
version: "2.2.4"
730+
version: "2.2.7"
745731
path_provider_foundation:
746732
dependency: transitive
747733
description:
@@ -770,10 +756,10 @@ packages:
770756
dependency: transitive
771757
description:
772758
name: path_provider_windows
773-
sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
759+
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
774760
url: "https://pub.dev"
775761
source: hosted
776-
version: "2.2.1"
762+
version: "2.3.0"
777763
petitparser:
778764
dependency: transitive
779765
description:
@@ -1031,10 +1017,10 @@ packages:
10311017
dependency: transitive
10321018
description:
10331019
name: string_scanner
1034-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
1020+
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
10351021
url: "https://pub.dev"
10361022
source: hosted
1037-
version: "1.2.0"
1023+
version: "1.3.0"
10381024
term_glyph:
10391025
dependency: transitive
10401026
description:
@@ -1111,18 +1097,18 @@ packages:
11111097
dependency: transitive
11121098
description:
11131099
name: url_launcher_android
1114-
sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
1100+
sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
11151101
url: "https://pub.dev"
11161102
source: hosted
1117-
version: "6.3.2"
1103+
version: "6.3.3"
11181104
url_launcher_ios:
11191105
dependency: transitive
11201106
description:
11211107
name: url_launcher_ios
1122-
sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
1108+
sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
11231109
url: "https://pub.dev"
11241110
source: hosted
1125-
version: "6.3.0"
1111+
version: "6.3.1"
11261112
url_launcher_linux:
11271113
dependency: transitive
11281114
description:
@@ -1175,10 +1161,10 @@ packages:
11751161
dependency: transitive
11761162
description:
11771163
name: uuid
1178-
sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
1164+
sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
11791165
url: "https://pub.dev"
11801166
source: hosted
1181-
version: "4.4.0"
1167+
version: "4.4.2"
11821168
vector_graphics:
11831169
dependency: transitive
11841170
description:
@@ -1215,10 +1201,10 @@ packages:
12151201
dependency: transitive
12161202
description:
12171203
name: vm_service
1218-
sha256: "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a"
1204+
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
12191205
url: "https://pub.dev"
12201206
source: hosted
1221-
version: "14.2.3"
1207+
version: "14.2.4"
12221208
watcher:
12231209
dependency: transitive
12241210
description:
@@ -1271,10 +1257,10 @@ packages:
12711257
dependency: transitive
12721258
description:
12731259
name: win32
1274-
sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
1260+
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
12751261
url: "https://pub.dev"
12761262
source: hosted
1277-
version: "5.5.0"
1263+
version: "5.5.1"
12781264
x25519:
12791265
dependency: transitive
12801266
description:
@@ -1308,5 +1294,5 @@ packages:
13081294
source: hosted
13091295
version: "3.1.2"
13101296
sdks:
1311-
dart: ">=3.3.0 <4.0.0"
1312-
flutter: ">=3.19.0"
1297+
dart: ">=3.4.0 <4.0.0"
1298+
flutter: ">=3.22.0"

0 commit comments

Comments
 (0)