Skip to content

Commit 1f4af7b

Browse files
authored
Merge pull request #51 from riverKanies/Update-deps-for-mac-and-ios
Update deps for mac and ios and instructions to use them
2 parents 9d5e311 + 602022d commit 1f4af7b

7 files changed

Lines changed: 371 additions & 199 deletions

File tree

README.md

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,47 @@ To use the `payjoin_flutter` package in your project, add it as a dependency in
88

99
```dart
1010
dependencies:
11-
payjoin_flutter: 0.20.0
11+
payjoin_flutter: 0.22.0
1212
```
1313
### Requirements
1414

1515
- Flutter : 3.0 or higher
1616
- Android minSdkVersion. : API 23 or higher.
1717
- Deployment target : iOS 12.0 or greater.
1818

19-
### Build and run code
20-
First we need to set up the `bitcoin core` and `esplora` locally in the regtest network. If you don't
21-
have these, please refer to this [page](https://learn.saylor.org/mod/page/view.php?id=36347). Or you can
22-
install `Nigiri Bitcoin`, which is a tool designed to simplify the process of running local instances of Bitcoin and
23-
Liquid networks for development and testing purposes. You can refer to
24-
this [link](https://github.com/vulpemventures/nigiri), to install it on your local machine.
2519

26-
Once the nigiri bitcoin starts running, you need to mine a few blocks. Please refer to the following [link](https://developer.bitcoin.org/reference/rpc/generatetoaddress.html?highlight=generate)
27-
on how to mine blocks.
28-
29-
30-
## Running the integration tests
31-
Once we have set up the Bitcoin core properly in the `Regtest` network,
20+
## Running the Example App
21+
Clone the repo, then:
3222

3323
```shell
34-
git clone https://github.com/LtbLightning/payjoin-flutter.git
3524
cd payjoin-flutter
36-
3725
cd example
38-
#Run integration tests with bitcoin_core and bdk_flutter
39-
flutter test integration_test
26+
27+
flutter pub get
28+
flutter run
29+
```
30+
31+
For more advanced usage notes see below
32+
33+
## Flutter and Flutter Rust Bridge Usage Notes
34+
Here are some useful commands when making changes that require rebuilding the generated code or running the example app to test:
35+
36+
```shell
37+
# You often need to run the build_runner to generate freezed files
38+
flutter pub get
39+
flutter pub run build_runner build --delete-conflicting-outputs
40+
flutter run
41+
42+
# Must be run after any updates to the rust code (can be set to watch)
43+
flutter_rust_bridge_codegen generate
44+
# or
45+
flutter_rust_bridge_codegen generate --watch
46+
# Note: generated files can be determined based off what the custom rust code is importing. If you're expecting something to be available from a generated file but your rust isn't compiling then regenerate (ex: frb_generated::RustOpaque type is determined by how it's used)
47+
48+
# Useful if your app build gets messed up (ios for example)
49+
flutter pub cache repair
4050
```
51+
4152
## References
4253

4354
[Payjoin Dev Kit](https://payjoindevkit.org/)

example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214
.vscode/settings.json
1315

example/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ SPEC CHECKSUMS:
3030

3131
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
3232

33-
COCOAPODS: 1.15.2
33+
COCOAPODS: 1.16.2

example/pubspec.lock

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
8+
sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "76.0.0"
12-
_macros:
13-
dependency: transitive
14-
description: dart
15-
source: sdk
16-
version: "0.3.3"
11+
version: "80.0.0"
1712
analyzer:
1813
dependency: transitive
1914
description:
2015
name: analyzer
21-
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
16+
sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
2217
url: "https://pub.dev"
2318
source: hosted
24-
version: "6.11.0"
19+
version: "7.3.0"
2520
args:
2621
dependency: transitive
2722
description:
@@ -59,10 +54,10 @@ packages:
5954
dependency: transitive
6055
description:
6156
name: build
62-
sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
57+
sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
6358
url: "https://pub.dev"
6459
source: hosted
65-
version: "2.4.1"
60+
version: "2.4.2"
6661
build_cli_annotations:
6762
dependency: transitive
6863
description:
@@ -83,10 +78,10 @@ packages:
8378
dependency: transitive
8479
description:
8580
name: built_value
86-
sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
81+
sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
8782
url: "https://pub.dev"
8883
source: hosted
89-
version: "8.9.2"
84+
version: "8.9.3"
9085
characters:
9186
dependency: transitive
9287
description:
@@ -147,10 +142,10 @@ packages:
147142
dependency: transitive
148143
description:
149144
name: dart_style
150-
sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
145+
sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac"
151146
url: "https://pub.dev"
152147
source: hosted
153-
version: "2.3.7"
148+
version: "3.0.1"
154149
fake_async:
155150
dependency: transitive
156151
description:
@@ -226,26 +221,26 @@ packages:
226221
dependency: transitive
227222
description:
228223
name: glob
229-
sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
224+
sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
230225
url: "https://pub.dev"
231226
source: hosted
232-
version: "2.1.2"
227+
version: "2.1.3"
233228
http:
234229
dependency: "direct main"
235230
description:
236231
name: http
237-
sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
232+
sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
238233
url: "https://pub.dev"
239234
source: hosted
240-
version: "1.2.2"
235+
version: "1.3.0"
241236
http_parser:
242237
dependency: transitive
243238
description:
244239
name: http_parser
245-
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
240+
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
246241
url: "https://pub.dev"
247242
source: hosted
248-
version: "4.0.2"
243+
version: "4.1.2"
249244
json_annotation:
250245
dependency: transitive
251246
description:
@@ -294,14 +289,6 @@ packages:
294289
url: "https://pub.dev"
295290
source: hosted
296291
version: "1.3.0"
297-
macros:
298-
dependency: transitive
299-
description:
300-
name: macros
301-
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
302-
url: "https://pub.dev"
303-
source: hosted
304-
version: "0.1.3-main.0"
305292
matcher:
306293
dependency: transitive
307294
description:
@@ -330,10 +317,10 @@ packages:
330317
dependency: transitive
331318
description:
332319
name: mockito
333-
sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917"
320+
sha256: f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6
334321
url: "https://pub.dev"
335322
source: hosted
336-
version: "5.4.4"
323+
version: "5.4.5"
337324
package_config:
338325
dependency: transitive
339326
description:
@@ -382,10 +369,10 @@ packages:
382369
dependency: transitive
383370
description:
384371
name: source_gen
385-
sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
372+
sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
386373
url: "https://pub.dev"
387374
source: hosted
388-
version: "1.5.0"
375+
version: "2.0.0"
389376
source_span:
390377
dependency: transitive
391378
description:
@@ -470,10 +457,10 @@ packages:
470457
dependency: transitive
471458
description:
472459
name: url_launcher_ios
473-
sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
460+
sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
474461
url: "https://pub.dev"
475462
source: hosted
476-
version: "6.3.1"
463+
version: "6.3.2"
477464
url_launcher_linux:
478465
dependency: transitive
479466
description:
@@ -486,10 +473,10 @@ packages:
486473
dependency: transitive
487474
description:
488475
name: url_launcher_macos
489-
sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
476+
sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
490477
url: "https://pub.dev"
491478
source: hosted
492-
version: "3.2.1"
479+
version: "3.2.2"
493480
url_launcher_platform_interface:
494481
dependency: transitive
495482
description:
@@ -502,18 +489,18 @@ packages:
502489
dependency: transitive
503490
description:
504491
name: url_launcher_web
505-
sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
492+
sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9"
506493
url: "https://pub.dev"
507494
source: hosted
508-
version: "2.3.3"
495+
version: "2.4.0"
509496
url_launcher_windows:
510497
dependency: transitive
511498
description:
512499
name: url_launcher_windows
513-
sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
500+
sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
514501
url: "https://pub.dev"
515502
source: hosted
516-
version: "3.1.3"
503+
version: "3.1.4"
517504
uuid:
518505
dependency: transitive
519506
description:
@@ -558,10 +545,10 @@ packages:
558545
dependency: transitive
559546
description:
560547
name: yaml
561-
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
548+
sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
562549
url: "https://pub.dev"
563550
source: hosted
564-
version: "3.1.2"
551+
version: "3.1.3"
565552
sdks:
566-
dart: ">=3.5.0 <4.0.0"
567-
flutter: ">=3.24.0"
553+
dart: ">=3.6.0 <4.0.0"
554+
flutter: ">=3.27.0"

0 commit comments

Comments
 (0)