Skip to content
This repository was archived by the owner on Sep 14, 2024. It is now read-only.

Commit 618bdf1

Browse files
pasichDevpasichDev
committed
Merge remote-tracking branch 'origin/v0.4.6' into v0.4.6
2 parents f4d159c + e27cf65 commit 618bdf1

File tree

5 files changed

+87
-37
lines changed

5 files changed

+87
-37
lines changed

‎cmd/build_linux.sh‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
FSOVA="NosoSova"
3-
FRPC="SovaRPC"
3+
FRPC="sovarpc-gui"
4+
FRPCCLI="sovarpc-cli"
45
FPRODUCTION="Release"
56

67
check_dart_flutter() {
@@ -31,8 +32,20 @@ build_linux_rpc() {
3132
cd "$FPRODUCTION" && mv bundle $FRPC
3233

3334
}
35+
build_linux_cli() {
36+
cd ..
37+
cd sovarpc
38+
cd bin
39+
dart compile exe wallet.dart -o wallet
40+
dart compile exe rpc.dart -o rpc
41+
cd ../../
42+
mkdir "$FPRODUCTION/$FRPCCLI"
43+
cp sovarpc/bin/wallet "$FPRODUCTION/$FRPCCLI"
44+
cp sovarpc/bin/rpc "$FPRODUCTION/$FRPCCLI"
3445

46+
}
3547
check_dart_flutter
3648
build_linux_sova
3749
build_linux_rpc
50+
build_linux_cli
3851

‎cmd/build_macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ build_linux_cli() {
3939
cd bin
4040
dart compile exe wallet.dart -o wallet
4141
dart compile exe rpc.dart -o rpc
42-
cd ../../ ##.//
42+
cd ../../
4343
mkdir "$FPRODUCTION/$FRPCCLI"
4444
cp sovarpc/bin/wallet "$FPRODUCTION/$FRPCCLI"
4545
cp sovarpc/bin/rpc "$FPRODUCTION/$FRPCCLI"

‎pubspec.lock‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ packages:
8585
dependency: transitive
8686
description:
8787
name: build_daemon
88-
sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
88+
sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "4.0.2"
91+
version: "4.0.1"
9292
build_resolvers:
9393
dependency: transitive
9494
description:
@@ -101,10 +101,10 @@ packages:
101101
dependency: "direct dev"
102102
description:
103103
name: build_runner
104-
sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa"
104+
sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
105105
url: "https://pub.dev"
106106
source: hosted
107-
version: "2.4.10"
107+
version: "2.4.9"
108108
build_runner_core:
109109
dependency: transitive
110110
description:
@@ -497,10 +497,10 @@ packages:
497497
dependency: "direct main"
498498
description:
499499
name: intl
500-
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
500+
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
501501
url: "https://pub.dev"
502502
source: hosted
503-
version: "0.19.0"
503+
version: "0.18.1"
504504
io:
505505
dependency: transitive
506506
description:
@@ -529,26 +529,26 @@ packages:
529529
dependency: transitive
530530
description:
531531
name: leak_tracker
532-
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
532+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
533533
url: "https://pub.dev"
534534
source: hosted
535-
version: "10.0.4"
535+
version: "10.0.0"
536536
leak_tracker_flutter_testing:
537537
dependency: transitive
538538
description:
539539
name: leak_tracker_flutter_testing
540-
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
540+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
541541
url: "https://pub.dev"
542542
source: hosted
543-
version: "3.0.3"
543+
version: "2.0.1"
544544
leak_tracker_testing:
545545
dependency: transitive
546546
description:
547547
name: leak_tracker_testing
548-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
548+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
549549
url: "https://pub.dev"
550550
source: hosted
551-
version: "3.0.1"
551+
version: "2.0.1"
552552
lints:
553553
dependency: transitive
554554
description:
@@ -593,10 +593,10 @@ packages:
593593
dependency: transitive
594594
description:
595595
name: meta
596-
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
596+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
597597
url: "https://pub.dev"
598598
source: hosted
599-
version: "1.12.0"
599+
version: "1.11.0"
600600
mime:
601601
dependency: transitive
602602
description:
@@ -960,10 +960,10 @@ packages:
960960
dependency: transitive
961961
description:
962962
name: shelf_web_socket
963-
sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
963+
sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
964964
url: "https://pub.dev"
965965
source: hosted
966-
version: "2.0.0"
966+
version: "1.0.4"
967967
sky_engine:
968968
dependency: transitive
969969
description: flutter
@@ -1069,10 +1069,10 @@ packages:
10691069
dependency: transitive
10701070
description:
10711071
name: test_api
1072-
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
1072+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
10731073
url: "https://pub.dev"
10741074
source: hosted
1075-
version: "0.7.0"
1075+
version: "0.6.1"
10761076
time:
10771077
dependency: transitive
10781078
description:
@@ -1205,10 +1205,10 @@ packages:
12051205
dependency: transitive
12061206
description:
12071207
name: vm_service
1208-
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
1208+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
12091209
url: "https://pub.dev"
12101210
source: hosted
1211-
version: "14.2.1"
1211+
version: "13.0.0"
12121212
watcher:
12131213
dependency: transitive
12141214
description:
@@ -1225,30 +1225,22 @@ packages:
12251225
url: "https://pub.dev"
12261226
source: hosted
12271227
version: "0.5.1"
1228-
web_socket:
1229-
dependency: transitive
1230-
description:
1231-
name: web_socket
1232-
sha256: bfe704c186c6e32a46f6607f94d079cd0b747b9a489fceeecc93cd3adb98edd5
1233-
url: "https://pub.dev"
1234-
source: hosted
1235-
version: "0.1.3"
12361228
web_socket_channel:
12371229
dependency: transitive
12381230
description:
12391231
name: web_socket_channel
1240-
sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276
1232+
sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
12411233
url: "https://pub.dev"
12421234
source: hosted
1243-
version: "3.0.0"
1235+
version: "2.4.5"
12441236
win32:
12451237
dependency: transitive
12461238
description:
12471239
name: win32
1248-
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
1240+
sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
12491241
url: "https://pub.dev"
12501242
source: hosted
1251-
version: "5.5.1"
1243+
version: "5.5.0"
12521244
window_manager:
12531245
dependency: "direct main"
12541246
description:
@@ -1290,5 +1282,5 @@ packages:
12901282
source: hosted
12911283
version: "3.1.2"
12921284
sdks:
1293-
dart: ">=3.4.0 <4.0.0"
1285+
dart: ">=3.3.4 <4.0.0"
12941286
flutter: ">=3.19.0"

‎pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ dependencies:
1212
sdk: flutter
1313
flutter_localizations:
1414
sdk: flutter
15-
intl: 0.19.0
15+
intl: ^0.19.0
1616
flutter_bloc: ^8.1.4
1717
bloc: ^8.1.3
1818
qr_flutter: ^4.0.0
1919
qr_code_scanner: ^1.0.1
2020
permission_handler: ^10.4.3
2121
provider: ^6.1.2
2222
drift: ^2.15.0
23-
sqlite3_flutter_libs: ^0.5.21
23+
sqlite3_flutter_libs: ^0.5.20
2424
path_provider: ^2.1.2
2525
path_provider_platform_interface: ^2.1.2
2626
path: ^1.8.3

‎sovarpc/pubspec.lock‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,14 @@ packages:
289289
url: "https://pub.dev"
290290
source: hosted
291291
version: "2.0.5"
292+
fake_async:
293+
dependency: transitive
294+
description:
295+
name: fake_async
296+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
297+
url: "https://pub.dev"
298+
source: hosted
299+
version: "1.3.1"
292300
ffi:
293301
dependency: transitive
294302
description:
@@ -443,6 +451,11 @@ packages:
443451
url: "https://pub.dev"
444452
source: hosted
445453
version: "2.0.10+1"
454+
flutter_test:
455+
dependency: "direct dev"
456+
description: flutter
457+
source: sdk
458+
version: "0.0.0"
446459
flutter_web_plugins:
447460
dependency: transitive
448461
description: flutter
@@ -544,6 +557,30 @@ packages:
544557
url: "https://pub.dev"
545558
source: hosted
546559
version: "4.9.0"
560+
leak_tracker:
561+
dependency: transitive
562+
description:
563+
name: leak_tracker
564+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
565+
url: "https://pub.dev"
566+
source: hosted
567+
version: "10.0.4"
568+
leak_tracker_flutter_testing:
569+
dependency: transitive
570+
description:
571+
name: leak_tracker_flutter_testing
572+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
573+
url: "https://pub.dev"
574+
source: hosted
575+
version: "3.0.3"
576+
leak_tracker_testing:
577+
dependency: transitive
578+
description:
579+
name: leak_tracker_testing
580+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
581+
url: "https://pub.dev"
582+
source: hosted
583+
version: "3.0.1"
547584
lints:
548585
dependency: transitive
549586
description:
@@ -1227,6 +1264,14 @@ packages:
12271264
url: "https://pub.dev"
12281265
source: hosted
12291266
version: "2.1.4"
1267+
vm_service:
1268+
dependency: transitive
1269+
description:
1270+
name: vm_service
1271+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
1272+
url: "https://pub.dev"
1273+
source: hosted
1274+
version: "14.2.1"
12301275
watcher:
12311276
dependency: transitive
12321277
description:

0 commit comments

Comments
 (0)